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

2 files changed, 54 insertions, 49 deletions

diff --git a/device/device.gyp b/device/device.gyp
index 001410f1..a7c520b 100644
--- a/device/device.gyp
+++ b/device/device.gyp
@@ -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',
-          ],
-        },
-      ],
-    }],
-  ],
 }
diff --git a/device/media_transfer_protocol/media_transfer_protocol.gyp b/device/media_transfer_protocol/media_transfer_protocol.gyp
new file mode 100644
index 0000000..469a9e5
--- /dev/null
+++ b/device/media_transfer_protocol/media_transfer_protocol.gyp
@@ -0,0 +1,54 @@
+# 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',
+      ],
+    },
+  ],
+}