device: Restructure the layout of gyp files.

This follow the same structure used by ui/keyboard/. Now the directory hierachy looks like this: device/bluetooth/bluetooth.gyp device/bluetooth/bluetooth_strings.gyp device/bluetooth/bluetooth_strings.grd device/bluetooth/strings device/usb/usb.gyp R=bryeung@chromium.org,miket@chromium.org Review URL: https://chromiumcodereview.appspot.com/16231013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203652 0039d316-1c4b-4281-b951-d872f2087c98
author: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2013-06-03 00:22:30 +0000
committer: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2013-06-03 00:22:30 +0000
commit: e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd (patch)
tree: eab2629e42f6f80d2b557691d19945c0ec696cce /device
parent: 7131880e814ea51968b4eb589d40c9478b10cb8d (diff)
download: chromium_src-e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd.zip
chromium_src-e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd.tar.gz
chromium_src-e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd.tar.bz2
58 files changed, 178 insertions, 157 deletions
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
new file mode 100644
index 0000000..cd4788b
--- /dev/null
+++ b/device/bluetooth/bluetooth.gyp
@@ -0,0 +1,121 @@
+# 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': [
+    {
+      'target_name': 'device_bluetooth',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../net/net.gyp:net',
+        '../../third_party/libxml/libxml.gyp:libxml',
+        '../../ui/ui.gyp:ui',
+        'bluetooth_strings.gyp:device_bluetooth_strings',
+      ],
+      'sources': [
+        'bluetooth_adapter.cc',
+        'bluetooth_adapter.h',
+        'bluetooth_adapter_experimental_chromeos.cc',
+        'bluetooth_adapter_experimental_chromeos.h',
+        'bluetooth_adapter_factory.cc',
+        'bluetooth_adapter_factory.h',
+        'bluetooth_adapter_mac.h',
+        'bluetooth_adapter_mac.mm',
+        'bluetooth_adapter_win.cc',
+        'bluetooth_adapter_win.h',
+        'bluetooth_device.cc',
+        'bluetooth_device.h',
+        'bluetooth_device_experimental_chromeos.cc',
+        'bluetooth_device_experimental_chromeos.h',
+        'bluetooth_device_mac.h',
+        'bluetooth_device_mac.mm',
+        'bluetooth_device_win.cc',
+        'bluetooth_device_win.h',
+        'bluetooth_init_win.cc',
+        'bluetooth_init_win.h',
+        'bluetooth_out_of_band_pairing_data.h',
+        'bluetooth_profile.cc',
+        'bluetooth_profile.h',
+        'bluetooth_profile_experimental_chromeos.cc',
+        'bluetooth_profile_experimental_chromeos.h',
+        'bluetooth_profile_mac.h',
+        'bluetooth_profile_mac.mm',
+        'bluetooth_profile_win.cc',
+        'bluetooth_profile_win.h',
+        'bluetooth_service_record.cc',
+        'bluetooth_service_record.h',
+        'bluetooth_service_record_mac.h',
+        'bluetooth_service_record_mac.mm',
+        'bluetooth_service_record_win.cc',
+        'bluetooth_service_record_win.h',
+        'bluetooth_socket.h',
+        'bluetooth_socket_experimental_chromeos.cc',
+        'bluetooth_socket_experimental_chromeos.h',
+        'bluetooth_socket_mac.h',
+        'bluetooth_socket_mac.mm',
+        'bluetooth_socket_win.cc',
+        'bluetooth_socket_win.h',
+        'bluetooth_task_manager_win.cc',
+        'bluetooth_task_manager_win.h',
+        'bluetooth_utils.cc',
+        'bluetooth_utils.h',
+      ],
+      'conditions': [
+        ['chromeos==1', {
+          'dependencies': [
+            '../../build/linux/system.gyp:dbus',
+            '../../chromeos/chromeos.gyp:chromeos',
+            '../../dbus/dbus.gyp:dbus',
+          ]
+        }],
+        ['OS=="win"', {
+          'all_dependent_settings': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'DelayLoadDLLs': [
+                  # Despite MSDN stating that Bthprops.dll contains the
+                  # symbols declared by bthprops.lib, they actually reside here:
+                  'Bthprops.cpl',
+                ],
+              },
+            },
+          },
+        }],
+        ['OS=="mac"', {
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
+            ],
+          },
+        }],
+      ],
+    },
+    {
+      'target_name': 'device_bluetooth_mocks',
+      'type': 'static_library',
+      'dependencies': [
+        '../../testing/gmock.gyp:gmock',
+        'device_bluetooth',
+      ],
+      'include_dirs': [
+        '../../',
+      ],
+      'sources': [
+        'test/mock_bluetooth_adapter.cc',
+        'test/mock_bluetooth_adapter.h',
+        'test/mock_bluetooth_device.cc',
+        'test/mock_bluetooth_device.h',
+        'test/mock_bluetooth_profile.cc',
+        'test/mock_bluetooth_profile.h',
+        'test/mock_bluetooth_socket.cc',
+        'test/mock_bluetooth_socket.h',
+      ],
+    },
+  ],
+}
diff --git a/device/device_bluetooth_strings.grd b/device/bluetooth/bluetooth_strings.grd
index 6d54815..7e10b62 100644
--- a/device/device_bluetooth_strings.grd
+++ b/device/bluetooth/bluetooth_strings.grd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-This file contains the strings for device_bluetooth.
+This file contains the strings for bluetooth.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
diff --git a/device/device_bluetooth_strings.gyp b/device/bluetooth/bluetooth_strings.gyp
index 3794f55..4bf3a30 100644
--- a/device/device_bluetooth_strings.gyp
+++ b/device/bluetooth/bluetooth_strings.gyp
@@ -3,27 +3,26 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
-  },
-
   'targets': [
     {
       'target_name': 'device_bluetooth_strings',
       'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth',
+      },
       'actions': [
         {
           'action_name': 'device_bluetooth_strings',
           'variables': {
-            'grit_grd_file': 'device_bluetooth_strings.grd',
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device_bluetooth_strings',
+            'grit_grd_file': 'bluetooth_strings.grd',
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ '../../build/grit_action.gypi' ],
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/device_bluetooth_strings',
+          '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
         ],
       },
     },
diff --git a/device/strings/device_bluetooth_strings_am.xtb b/device/bluetooth/strings/device_bluetooth_strings_am.xtb
index 6c985cb8..6c985cb8 100644
--- a/device/strings/device_bluetooth_strings_am.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_am.xtb
diff --git a/device/strings/device_bluetooth_strings_ar.xtb b/device/bluetooth/strings/device_bluetooth_strings_ar.xtb
index e8b5562..e8b5562 100644
--- a/device/strings/device_bluetooth_strings_ar.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ar.xtb
diff --git a/device/strings/device_bluetooth_strings_bg.xtb b/device/bluetooth/strings/device_bluetooth_strings_bg.xtb
index ebab473..ebab473 100644
--- a/device/strings/device_bluetooth_strings_bg.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_bg.xtb
diff --git a/device/strings/device_bluetooth_strings_bn.xtb b/device/bluetooth/strings/device_bluetooth_strings_bn.xtb
index a66cc1f..a66cc1f 100644
--- a/device/strings/device_bluetooth_strings_bn.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_bn.xtb
diff --git a/device/strings/device_bluetooth_strings_ca.xtb b/device/bluetooth/strings/device_bluetooth_strings_ca.xtb
index 1438d89..1438d89 100644
--- a/device/strings/device_bluetooth_strings_ca.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ca.xtb
diff --git a/device/strings/device_bluetooth_strings_cs.xtb b/device/bluetooth/strings/device_bluetooth_strings_cs.xtb
index 2d95130..2d95130 100644
--- a/device/strings/device_bluetooth_strings_cs.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_cs.xtb
diff --git a/device/strings/device_bluetooth_strings_da.xtb b/device/bluetooth/strings/device_bluetooth_strings_da.xtb
index 751fa4a..751fa4a 100644
--- a/device/strings/device_bluetooth_strings_da.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_da.xtb
diff --git a/device/strings/device_bluetooth_strings_de.xtb b/device/bluetooth/strings/device_bluetooth_strings_de.xtb
index 91de7f51..91de7f51 100644
--- a/device/strings/device_bluetooth_strings_de.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_de.xtb
diff --git a/device/strings/device_bluetooth_strings_el.xtb b/device/bluetooth/strings/device_bluetooth_strings_el.xtb
index 6e5e7d8..6e5e7d8 100644
--- a/device/strings/device_bluetooth_strings_el.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_el.xtb
diff --git a/device/strings/device_bluetooth_strings_en-GB.xtb b/device/bluetooth/strings/device_bluetooth_strings_en-GB.xtb
index 0fb2133..0fb2133 100644
--- a/device/strings/device_bluetooth_strings_en-GB.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_en-GB.xtb
diff --git a/device/strings/device_bluetooth_strings_es-419.xtb b/device/bluetooth/strings/device_bluetooth_strings_es-419.xtb
index 2fe4770..2fe4770 100644
--- a/device/strings/device_bluetooth_strings_es-419.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_es-419.xtb
diff --git a/device/strings/device_bluetooth_strings_es.xtb b/device/bluetooth/strings/device_bluetooth_strings_es.xtb
index 64022ec..64022ec 100644
--- a/device/strings/device_bluetooth_strings_es.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_es.xtb
diff --git a/device/strings/device_bluetooth_strings_et.xtb b/device/bluetooth/strings/device_bluetooth_strings_et.xtb
index 5244dfd..5244dfd 100644
--- a/device/strings/device_bluetooth_strings_et.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_et.xtb
diff --git a/device/strings/device_bluetooth_strings_fa.xtb b/device/bluetooth/strings/device_bluetooth_strings_fa.xtb
index 18626f8..18626f8 100644
--- a/device/strings/device_bluetooth_strings_fa.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_fa.xtb
diff --git a/device/strings/device_bluetooth_strings_fi.xtb b/device/bluetooth/strings/device_bluetooth_strings_fi.xtb
index 4691cd5..4691cd5 100644
--- a/device/strings/device_bluetooth_strings_fi.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_fi.xtb
diff --git a/device/strings/device_bluetooth_strings_fil.xtb b/device/bluetooth/strings/device_bluetooth_strings_fil.xtb
index 443630e..443630e 100644
--- a/device/strings/device_bluetooth_strings_fil.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_fil.xtb
diff --git a/device/strings/device_bluetooth_strings_fr.xtb b/device/bluetooth/strings/device_bluetooth_strings_fr.xtb
index 63026a3..63026a3 100644
--- a/device/strings/device_bluetooth_strings_fr.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_fr.xtb
diff --git a/device/strings/device_bluetooth_strings_gu.xtb b/device/bluetooth/strings/device_bluetooth_strings_gu.xtb
index 7d8a4df..7d8a4df 100644
--- a/device/strings/device_bluetooth_strings_gu.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_gu.xtb
diff --git a/device/strings/device_bluetooth_strings_hi.xtb b/device/bluetooth/strings/device_bluetooth_strings_hi.xtb
index a6ddd5d..a6ddd5d 100644
--- a/device/strings/device_bluetooth_strings_hi.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_hi.xtb
diff --git a/device/strings/device_bluetooth_strings_hr.xtb b/device/bluetooth/strings/device_bluetooth_strings_hr.xtb
index 26f99d0..26f99d0 100644
--- a/device/strings/device_bluetooth_strings_hr.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_hr.xtb
diff --git a/device/strings/device_bluetooth_strings_hu.xtb b/device/bluetooth/strings/device_bluetooth_strings_hu.xtb
index 7ef9a5e..7ef9a5e 100644
--- a/device/strings/device_bluetooth_strings_hu.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_hu.xtb
diff --git a/device/strings/device_bluetooth_strings_id.xtb b/device/bluetooth/strings/device_bluetooth_strings_id.xtb
index aa34783..aa34783 100644
--- a/device/strings/device_bluetooth_strings_id.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_id.xtb
diff --git a/device/strings/device_bluetooth_strings_it.xtb b/device/bluetooth/strings/device_bluetooth_strings_it.xtb
index a6ac8d46..a6ac8d46 100644
--- a/device/strings/device_bluetooth_strings_it.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_it.xtb
diff --git a/device/strings/device_bluetooth_strings_iw.xtb b/device/bluetooth/strings/device_bluetooth_strings_iw.xtb
index 86b5533..86b5533 100644
--- a/device/strings/device_bluetooth_strings_iw.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_iw.xtb
diff --git a/device/strings/device_bluetooth_strings_ja.xtb b/device/bluetooth/strings/device_bluetooth_strings_ja.xtb
index 23139e6..23139e6 100644
--- a/device/strings/device_bluetooth_strings_ja.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ja.xtb
diff --git a/device/strings/device_bluetooth_strings_kn.xtb b/device/bluetooth/strings/device_bluetooth_strings_kn.xtb
index cc3643a..cc3643a 100644
--- a/device/strings/device_bluetooth_strings_kn.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_kn.xtb
diff --git a/device/strings/device_bluetooth_strings_ko.xtb b/device/bluetooth/strings/device_bluetooth_strings_ko.xtb
index e0fc370..e0fc370 100644
--- a/device/strings/device_bluetooth_strings_ko.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ko.xtb
diff --git a/device/strings/device_bluetooth_strings_lt.xtb b/device/bluetooth/strings/device_bluetooth_strings_lt.xtb
index 5804ae2..5804ae2 100644
--- a/device/strings/device_bluetooth_strings_lt.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_lt.xtb
diff --git a/device/strings/device_bluetooth_strings_lv.xtb b/device/bluetooth/strings/device_bluetooth_strings_lv.xtb
index a0a1c47..a0a1c47 100644
--- a/device/strings/device_bluetooth_strings_lv.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_lv.xtb
diff --git a/device/strings/device_bluetooth_strings_ml.xtb b/device/bluetooth/strings/device_bluetooth_strings_ml.xtb
index f7db315..f7db315 100644
--- a/device/strings/device_bluetooth_strings_ml.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ml.xtb
diff --git a/device/strings/device_bluetooth_strings_mr.xtb b/device/bluetooth/strings/device_bluetooth_strings_mr.xtb
index 098d29c..098d29c 100644
--- a/device/strings/device_bluetooth_strings_mr.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_mr.xtb
diff --git a/device/strings/device_bluetooth_strings_ms.xtb b/device/bluetooth/strings/device_bluetooth_strings_ms.xtb
index 1fb470a..1fb470a 100644
--- a/device/strings/device_bluetooth_strings_ms.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ms.xtb
diff --git a/device/strings/device_bluetooth_strings_nl.xtb b/device/bluetooth/strings/device_bluetooth_strings_nl.xtb
index e782410..e782410 100644
--- a/device/strings/device_bluetooth_strings_nl.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_nl.xtb
diff --git a/device/strings/device_bluetooth_strings_no.xtb b/device/bluetooth/strings/device_bluetooth_strings_no.xtb
index 913638b..913638b 100644
--- a/device/strings/device_bluetooth_strings_no.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_no.xtb
diff --git a/device/strings/device_bluetooth_strings_pl.xtb b/device/bluetooth/strings/device_bluetooth_strings_pl.xtb
index 4519e3d..4519e3d 100644
--- a/device/strings/device_bluetooth_strings_pl.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_pl.xtb
diff --git a/device/strings/device_bluetooth_strings_pt-BR.xtb b/device/bluetooth/strings/device_bluetooth_strings_pt-BR.xtb
index e95eb56..e95eb56 100644
--- a/device/strings/device_bluetooth_strings_pt-BR.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_pt-BR.xtb
diff --git a/device/strings/device_bluetooth_strings_pt-PT.xtb b/device/bluetooth/strings/device_bluetooth_strings_pt-PT.xtb
index 1dcf557a..1dcf557a 100644
--- a/device/strings/device_bluetooth_strings_pt-PT.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_pt-PT.xtb
diff --git a/device/strings/device_bluetooth_strings_ro.xtb b/device/bluetooth/strings/device_bluetooth_strings_ro.xtb
index 9e43493..9e43493 100644
--- a/device/strings/device_bluetooth_strings_ro.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ro.xtb
diff --git a/device/strings/device_bluetooth_strings_ru.xtb b/device/bluetooth/strings/device_bluetooth_strings_ru.xtb
index c4a621b..c4a621b 100644
--- a/device/strings/device_bluetooth_strings_ru.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ru.xtb
diff --git a/device/strings/device_bluetooth_strings_sk.xtb b/device/bluetooth/strings/device_bluetooth_strings_sk.xtb
index 00750d3..00750d3 100644
--- a/device/strings/device_bluetooth_strings_sk.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_sk.xtb
diff --git a/device/strings/device_bluetooth_strings_sl.xtb b/device/bluetooth/strings/device_bluetooth_strings_sl.xtb
index 489b7e4..489b7e4 100644
--- a/device/strings/device_bluetooth_strings_sl.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_sl.xtb
diff --git a/device/strings/device_bluetooth_strings_sr.xtb b/device/bluetooth/strings/device_bluetooth_strings_sr.xtb
index 38f6f35..38f6f35 100644
--- a/device/strings/device_bluetooth_strings_sr.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_sr.xtb
diff --git a/device/strings/device_bluetooth_strings_sv.xtb b/device/bluetooth/strings/device_bluetooth_strings_sv.xtb
index ddea3dc..ddea3dc 100644
--- a/device/strings/device_bluetooth_strings_sv.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_sv.xtb
diff --git a/device/strings/device_bluetooth_strings_sw.xtb b/device/bluetooth/strings/device_bluetooth_strings_sw.xtb
index b775088..b775088 100644
--- a/device/strings/device_bluetooth_strings_sw.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_sw.xtb
diff --git a/device/strings/device_bluetooth_strings_ta.xtb b/device/bluetooth/strings/device_bluetooth_strings_ta.xtb
index ef90687..ef90687 100644
--- a/device/strings/device_bluetooth_strings_ta.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_ta.xtb
diff --git a/device/strings/device_bluetooth_strings_te.xtb b/device/bluetooth/strings/device_bluetooth_strings_te.xtb
index 48c714b..48c714b 100644
--- a/device/strings/device_bluetooth_strings_te.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_te.xtb
diff --git a/device/strings/device_bluetooth_strings_th.xtb b/device/bluetooth/strings/device_bluetooth_strings_th.xtb
index fae3196..fae3196 100644
--- a/device/strings/device_bluetooth_strings_th.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_th.xtb
diff --git a/device/strings/device_bluetooth_strings_tr.xtb b/device/bluetooth/strings/device_bluetooth_strings_tr.xtb
index 9a29951..9a29951 100644
--- a/device/strings/device_bluetooth_strings_tr.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_tr.xtb
diff --git a/device/strings/device_bluetooth_strings_uk.xtb b/device/bluetooth/strings/device_bluetooth_strings_uk.xtb
index f0db52c..f0db52c 100644
--- a/device/strings/device_bluetooth_strings_uk.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_uk.xtb
diff --git a/device/strings/device_bluetooth_strings_vi.xtb b/device/bluetooth/strings/device_bluetooth_strings_vi.xtb
index b2957da..b2957da 100644
--- a/device/strings/device_bluetooth_strings_vi.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_vi.xtb
diff --git a/device/strings/device_bluetooth_strings_zh-CN.xtb b/device/bluetooth/strings/device_bluetooth_strings_zh-CN.xtb
index 26e8b40..26e8b40 100644
--- a/device/strings/device_bluetooth_strings_zh-CN.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_zh-CN.xtb
diff --git a/device/strings/device_bluetooth_strings_zh-TW.xtb b/device/bluetooth/strings/device_bluetooth_strings_zh-TW.xtb
index 935ef48..935ef48 100644
--- a/device/strings/device_bluetooth_strings_zh-TW.xtb
+++ b/device/bluetooth/strings/device_bluetooth_strings_zh-TW.xtb
diff --git a/device/device.gyp b/device/device.gyp
index 7b26e34..001410f1 100644
--- a/device/device.gyp
+++ b/device/device.gyp
@@ -8,159 +8,15 @@
   },
   'targets': [
     {
-      'target_name': 'device_bluetooth',
-      'type': 'static_library',
-      'dependencies': [
-        'device_bluetooth_strings.gyp:device_bluetooth_strings',
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../net/net.gyp:net',
-        '../third_party/libxml/libxml.gyp:libxml',
-        '../ui/ui.gyp:ui'
-      ],
-      'sources': [
-        'bluetooth/bluetooth_adapter.cc',
-        'bluetooth/bluetooth_adapter.h',
-        'bluetooth/bluetooth_adapter_experimental_chromeos.cc',
-        'bluetooth/bluetooth_adapter_experimental_chromeos.h',
-        'bluetooth/bluetooth_adapter_factory.cc',
-        'bluetooth/bluetooth_adapter_factory.h',
-        'bluetooth/bluetooth_adapter_mac.h',
-        'bluetooth/bluetooth_adapter_mac.mm',
-        'bluetooth/bluetooth_adapter_win.cc',
-        'bluetooth/bluetooth_adapter_win.h',
-        'bluetooth/bluetooth_device.cc',
-        'bluetooth/bluetooth_device.h',
-        'bluetooth/bluetooth_device_experimental_chromeos.cc',
-        'bluetooth/bluetooth_device_experimental_chromeos.h',
-        'bluetooth/bluetooth_device_mac.h',
-        'bluetooth/bluetooth_device_mac.mm',
-        'bluetooth/bluetooth_device_win.cc',
-        'bluetooth/bluetooth_device_win.h',
-        'bluetooth/bluetooth_init_win.cc',
-        'bluetooth/bluetooth_init_win.h',
-        'bluetooth/bluetooth_out_of_band_pairing_data.h',
-        'bluetooth/bluetooth_profile.cc',
-        'bluetooth/bluetooth_profile.h',
-        'bluetooth/bluetooth_profile_experimental_chromeos.cc',
-        'bluetooth/bluetooth_profile_experimental_chromeos.h',
-        'bluetooth/bluetooth_profile_mac.h',
-        'bluetooth/bluetooth_profile_mac.mm',
-        'bluetooth/bluetooth_profile_win.cc',
-        'bluetooth/bluetooth_profile_win.h',
-        'bluetooth/bluetooth_service_record.cc',
-        'bluetooth/bluetooth_service_record.h',
-        'bluetooth/bluetooth_service_record_mac.h',
-        'bluetooth/bluetooth_service_record_mac.mm',
-        'bluetooth/bluetooth_service_record_win.cc',
-        'bluetooth/bluetooth_service_record_win.h',
-        'bluetooth/bluetooth_socket.h',
-        'bluetooth/bluetooth_socket_experimental_chromeos.cc',
-        'bluetooth/bluetooth_socket_experimental_chromeos.h',
-        'bluetooth/bluetooth_socket_mac.h',
-        'bluetooth/bluetooth_socket_mac.mm',
-        'bluetooth/bluetooth_socket_win.cc',
-        'bluetooth/bluetooth_socket_win.h',
-        'bluetooth/bluetooth_task_manager_win.cc',
-        'bluetooth/bluetooth_task_manager_win.h',
-        'bluetooth/bluetooth_utils.cc',
-        'bluetooth/bluetooth_utils.h',
-      ],
-      'conditions': [
-        ['chromeos==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus',
-            '../chromeos/chromeos.gyp:chromeos',
-            '../dbus/dbus.gyp:dbus',
-          ]
-        }],
-        ['OS=="win"', {
-          'all_dependent_settings': {
-            'msvs_settings': {
-              'VCLinkerTool': {
-                'DelayLoadDLLs': [
-                  # Despite MSDN stating that Bthprops.dll contains the
-                  # symbols declared by bthprops.lib, they actually reside here:
-                  'Bthprops.cpl',
-                ],
-              },
-            },
-          },
-        }],
-        ['OS=="mac"', {
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
-            ],
-          },
-        }],
-      ],
-    },
-    {
-      'target_name': 'device_bluetooth_mocks',
-      'type': 'static_library',
-      'dependencies': [
-        'device_bluetooth',
-        '../testing/gmock.gyp:gmock',
-      ],
-      'sources': [
-        'bluetooth/test/mock_bluetooth_adapter.cc',
-        'bluetooth/test/mock_bluetooth_adapter.h',
-        'bluetooth/test/mock_bluetooth_device.cc',
-        'bluetooth/test/mock_bluetooth_device.h',
-        'bluetooth/test/mock_bluetooth_profile.cc',
-        'bluetooth/test/mock_bluetooth_profile.h',
-        'bluetooth/test/mock_bluetooth_socket.cc',
-        'bluetooth/test/mock_bluetooth_socket.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-    },
-    {
-      'target_name': 'device_usb',
-      'type': 'static_library',
-      'sources': [
-        'usb/usb_ids.cc',
-        'usb/usb_ids.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'actions': [
-        {
-          'action_name': 'generate_usb_ids',
-          'variables': {
-            'usb_ids_path%': '<(DEPTH)/third_party/usb_ids/usb.ids',
-            'usb_ids_py_path': '<(DEPTH)/tools/usb_ids/usb_ids.py',
-          },
-          'inputs': [
-            '<(usb_ids_path)',
-            '<(usb_ids_py_path)',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/device/usb/usb_ids_gen.cc',
-          ],
-          'action': [
-            'python',
-            '<(usb_ids_py_path)',
-            '-i', '<(usb_ids_path)',
-            '-o', '<@(_outputs)',
-          ],
-          'process_outputs_as_sources': 1,
-        },
-      ],
-    },
-    {
       'target_name': 'device_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
-        'device_bluetooth',
-        'device_bluetooth_mocks',
-        'device_usb',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        'bluetooth/bluetooth.gyp:device_bluetooth',
+        'bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+        'usb/usb.gyp:device_usb',
       ],
       'sources': [
         'bluetooth/bluetooth_adapter_mac_unittest.mm',
diff --git a/device/usb/usb.gyp b/device/usb/usb.gyp
new file mode 100644
index 0000000..b7cae89
--- /dev/null
+++ b/device/usb/usb.gyp
@@ -0,0 +1,45 @@
+# 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': [
+    {
+      'target_name': 'device_usb',
+      'type': 'static_library',
+      'include_dirs': [
+        '../..',
+      ],
+      'sources': [
+        'usb_ids.cc',
+        'usb_ids.h',
+      ],
+      'actions': [
+        {
+          'action_name': 'generate_usb_ids',
+          'variables': {
+            'usb_ids_path%': '<(DEPTH)/third_party/usb_ids/usb.ids',
+            'usb_ids_py_path': '<(DEPTH)/tools/usb_ids/usb_ids.py',
+          },
+          'inputs': [
+            '<(usb_ids_path)',
+            '<(usb_ids_py_path)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/device/usb/usb_ids_gen.cc',
+          ],
+          'action': [
+            'python',
+            '<(usb_ids_py_path)',
+            '-i', '<(usb_ids_path)',
+            '-o', '<@(_outputs)',
+          ],
+          'process_outputs_as_sources': 1,
+        },
+      ],
+    },
+  ],
+}
diff --git a/device/usb/usb_ids.h b/device/usb/usb_ids.h
index 2f6b950..9b9461e 100644
--- a/device/usb/usb_ids.h
+++ b/device/usb/usb_ids.h
@@ -45,7 +45,7 @@ class UsbIds {
   // such vendor exists.
   static const UsbVendor* FindVendor(uint16_t vendor_id);
 
-  // These fields are defined in a generated file. See device/device.gyp for
+  // These fields are defined in a generated file. See device/usb/usb.gyp for
   // more information on how they are generated.
   static const size_t vendor_size_;
   static const UsbVendor vendors_[];
author	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2013-06-03 00:22:30 +0000
committer	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2013-06-03 00:22:30 +0000
commit	e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd (patch)
tree	eab2629e42f6f80d2b557691d19945c0ec696cce /device
parent	7131880e814ea51968b4eb589d40c9478b10cb8d (diff)
download	chromium_src-e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd.zip chromium_src-e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd.tar.gz chromium_src-e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd.tar.bz2