diff options
| author | alexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 01:39:41 +0000 |
|---|---|---|
| committer | alexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 01:39:41 +0000 |
| commit | ef7a90115673e15c938c35a6b161fdc2b754db88 (patch) | |
| tree | 2f890929f57e1a10e2a0a72ba5f4158f9bbc2c17 /device/device.gyp | |
| parent | 9fe62842925c14e78517abc512ddc6d6d55cafd2 (diff) | |
| download | chromium_src-ef7a90115673e15c938c35a6b161fdc2b754db88.zip chromium_src-ef7a90115673e15c938c35a6b161fdc2b754db88.tar.gz chromium_src-ef7a90115673e15c938c35a6b161fdc2b754db88.tar.bz2 | |
Revert 175073 because it fails to compile on Linux.
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Builder%20x64&number=65699
> [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device.
>
> BUG=156929
> TEST=none
>
>
> Review URL: https://chromiumcodereview.appspot.com/11744014
TBR=kmadhusu@chromium.org
Review URL: https://codereview.chromium.org/11722025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/device.gyp')
| -rw-r--r-- | device/device.gyp | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/device/device.gyp b/device/device.gyp index c8e6a50..25db3cb 100644 --- a/device/device.gyp +++ b/device/device.gyp @@ -151,53 +151,4 @@ ], }, ], - 'conditions': [ - ['OS=="linux"', { - 'targets': [ - { - # Protobuf compiler / generator for the MtpFileEntry and - # MtpFileEntries protocol buffers. - 'target_name': 'mtp_file_entry_proto', - 'type': 'static_library', - 'sources': [ - '../third_party/cros_system_api/dbus/mtp_file_entry.proto', - ], - 'variables': { - 'proto_in_dir': '../third_party/cros_system_api/dbus', - 'proto_out_dir': 'device/media_transfer_protocol', - }, - 'includes': ['../build/protoc.gypi'], - }, - { - # Protobuf compiler / generator for the MtpStorageInfo protocol - # buffer. - 'target_name': 'mtp_storage_info_proto', - 'type': 'static_library', - 'sources': [ - '../third_party/cros_system_api/dbus/mtp_storage_info.proto', - ], - 'variables': { - 'proto_in_dir': '../third_party/cros_system_api/dbus', - 'proto_out_dir': 'device/media_transfer_protocol', - }, - 'includes': ['../build/protoc.gypi'], - }, - { - 'target_name': 'device_media_transfer_protocol', - 'type': 'static_library', - 'dependencies': [ - '../build/linux/system.gyp:dbus', - 'mtp_file_entry_proto', - 'mtp_storage_info_proto', - ], - 'sources': [ - 'media_transfer_protocol/media_transfer_protocol_daemon_client.cc', - 'media_transfer_protocol/media_transfer_protocol_daemon_client.h', - 'media_transfer_protocol/media_transfer_protocol_manager.cc', - 'media_transfer_protocol/media_transfer_protocol_manager.h', - ], - }, - ], - }], - ], } |