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

Unified Diff: chromeos/chromeos.gyp

Issue 10913048: CrOS: Convert MediaTransferProtocolDaemonClient to use protobufs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address comments Created 8 years, 3 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/chrome_browser_chromeos.gypi ('k') | chromeos/dbus/media_transfer_protocol_daemon_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/chromeos.gyp
===================================================================
--- chromeos/chromeos.gyp (revision 155895)
+++ chromeos/chromeos.gyp (working copy)
@@ -16,6 +16,8 @@
'../dbus/dbus.gyp:dbus',
'../net/net.gyp:net',
'../third_party/libxml/libxml.gyp:libxml',
+ 'mtp_file_entry_proto',
+ 'mtp_storage_info_proto',
'power_state_control_proto',
'power_supply_properties_proto',
],
@@ -137,6 +139,7 @@
'../build/linux/system.gyp:dbus',
'../testing/gmock.gyp:gmock',
'chromeos',
+ 'mtp_file_entry_proto',
],
'sources': [
'cryptohome/mock_async_method_caller.cc',
@@ -269,6 +272,37 @@
],
},
{
+ # 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': 'chromeos/dbus',
+ 'cc_generator_options': 'dllexport_decl=CHROMEOS_EXPORT:',
+ 'cc_include': 'chromeos/chromeos_export.h',
+ },
+ 'includes': ['../build/protoc.gypi'],
+ },
+ {
+ # Protobuf compiler / generator for the MtpStorageInfo protocol buffers.
+ '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': 'chromeos/dbus',
+ 'cc_generator_options': 'dllexport_decl=CHROMEOS_EXPORT:',
+ 'cc_include': 'chromeos/chromeos_export.h',
+ },
+ 'includes': ['../build/protoc.gypi'],
+ },
+ {
# Protobuf compiler / generator for the PowerSupplyProperties protocol
# buffer.
'target_name': 'power_state_control_proto',
@@ -277,7 +311,7 @@
'../third_party/cros_system_api/dbus/power_state_control.proto',
],
'variables': {
- 'proto_in_dir': '../third_party/cros_system_api/dbus/',
+ 'proto_in_dir': '../third_party/cros_system_api/dbus',
'proto_out_dir': 'chromeos/dbus',
},
'includes': ['../build/protoc.gypi'],
@@ -291,7 +325,7 @@
'../third_party/cros_system_api/dbus/power_supply_properties.proto',
],
'variables': {
- 'proto_in_dir': '../third_party/cros_system_api/dbus/',
+ 'proto_in_dir': '../third_party/cros_system_api/dbus',
'proto_out_dir': 'chromeos/dbus',
},
'includes': ['../build/protoc.gypi'],
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chromeos/dbus/media_transfer_protocol_daemon_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698