Skip to content

GitLab

T
tangled
Commit 954d5ee8 authored by tfarina@chromium.org's avatar tfarina@chromium.org
Browse files
Options

device: Gyp organization part 2. 

This moves media_transfer_protocol targets into:
device/media_transfer_protocol/media_transfer_protocol.gyp

So it's consistent with what we have done with bluetooth and usb
directories/targets.

R=bryeung@chromium.org,miket@chromium.org,thestig@chromium.org
TBR=thestig@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16142004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204040 0039d316-1c4b-4281-b951-d872f2087c98
parent a2d126e6
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 54 deletions
chrome/chrome_browser.gypi
View file @ 954d5ee8
...@@ -2580,9 +2580,9 @@ ...@@ -2580,9 +2580,9 @@
['OS=="linux"', { ['OS=="linux"', {
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:udev', '../build/linux/system.gyp:udev',
'../device/device.gyp:mtp_file_entry_proto', '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto',
'../device/device.gyp:mtp_storage_info_proto', '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto',
'../device/device.gyp:device_media_transfer_protocol', '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
], ],
}], }],
['OS=="linux" and chromeos==0', { ['OS=="linux" and chromeos==0', {
......
device/device.gyp
View file @ 954d5ee8
...@@ -59,53 +59,4 @@ ...@@ -59,53 +59,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',
],
},
],
}],
],
} }
device/media_transfer_protocol/media_transfer_protocol.gyp 0 → 100644
View file @ 954d5ee8
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'chromium_code': 1,
},
'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_daemon_client.cc',
'media_transfer_protocol_daemon_client.h',
'media_transfer_protocol_manager.cc',
'media_transfer_protocol_manager.h',
],
},
],
}
third_party/mtpd/mtpd.gyp
View file @ 954d5ee8
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
'../../base/base.gyp:base', '../../base/base.gyp:base',
'../../build/linux/system.gyp:glib', '../../build/linux/system.gyp:glib',
'../../build/linux/system.gyp:udev', '../../build/linux/system.gyp:udev',
'../../device/device.gyp:mtp_file_entry_proto', '../../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto',
'../../device/device.gyp:mtp_storage_info_proto', '../../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto',
'../../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:dbus_cplusplus', '../../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:dbus_cplusplus',
'../../third_party/libmtp/libmtp.gyp:libmtp', '../../third_party/libmtp/libmtp.gyp:libmtp',
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment