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

Unified Diff: chrome/chrome_browser.gypi

Issue 11722025: Revert 175073 because it fails to compile on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi (revision 175074)
+++ chrome/chrome_browser.gypi (working copy)
@@ -2458,9 +2458,16 @@
}],
['OS=="linux"', {
'dependencies': [
+ 'mtp_file_entry_proto',
+ 'mtp_storage_info_proto',
'../build/linux/system.gyp:udev',
- '../device/device.gyp:device_media_transfer_protocol',
],
+ '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',
+ ],
}],
['OS=="linux" and chromeos==0', {
'dependencies': [
@@ -3117,5 +3124,38 @@
],
},
],
+ ['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'],
+ },
+ ],
+ },
+ ],
],
}

Powered by Google App Engine
This is Rietveld 408576698