Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2260)

Unified Diff: chrome/chrome_browser.gypi

Issue 11744014: [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gclient runhooks error Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc ('k') | chrome/common/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ee7e5ff88ccf0cbdaf56dd8cb0e97dd5d06c8d96..2ef560b2fe68434f54d9943eccc7b0d058a5b3c1 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2467,15 +2467,8 @@
}],
['OS=="linux"', {
'dependencies': [
- 'mtp_file_entry_proto',
- 'mtp_storage_info_proto',
'../build/linux/system.gyp:udev',
- ],
- 'sources': [
- 'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc',
- 'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h',
- 'browser/media_transfer_protocol/media_transfer_protocol_manager.cc',
- 'browser/media_transfer_protocol/media_transfer_protocol_manager.h',
+ '../device/device.gyp:device_media_transfer_protocol',
],
}],
['OS=="linux" and chromeos==0', {
@@ -3131,38 +3124,5 @@
],
},
],
- ['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': 'chrome/browser/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': 'chrome/browser/media_transfer_protocol',
- },
- 'includes': ['../build/protoc.gypi'],
- },
- ],
- },
- ],
],
}
« no previous file with comments | « chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc ('k') | chrome/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698