Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / device / bluetooth / bluetooth.gyp

diff --git a/src/device/bluetooth/bluetooth.gyp b/src/device/bluetooth/bluetooth.gyp
index 4d206ec..d6b8c7e 100644 (file)
--- a/src/device/bluetooth/bluetooth.gyp
+++ b/src/device/bluetooth/bluetooth.gyp
@@ -8,19 +8,17 @@
   },
   'targets': [
     {
+      # GN version: //device/bluetooth
       '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/base/ui_base.gyp:ui_base',
-        '../../ui/gfx/gfx.gyp:gfx',
-        '../../ui/gfx/gfx.gyp:gfx_geometry',
         'bluetooth_strings.gyp:device_bluetooth_strings',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'bluetooth_adapter.cc',
         'bluetooth_adapter.h',
         'bluetooth_adapter_chromeos.cc',
@@ -63,6 +61,10 @@
         'bluetooth_init_win.h',
         'bluetooth_l2cap_channel_mac.mm',
         'bluetooth_l2cap_channel_mac.h',
+        'bluetooth_low_energy_defs_win.cc',
+        'bluetooth_low_energy_defs_win.h',
+        'bluetooth_low_energy_win.cc',
+        'bluetooth_low_energy_win.h',
         'bluetooth_pairing_chromeos.cc',
         'bluetooth_pairing_chromeos.h',
         'bluetooth_remote_gatt_characteristic_chromeos.cc',
@@ -98,6 +100,9 @@
             '../../build/linux/system.gyp:dbus',
             '../../chromeos/chromeos.gyp:chromeos',
             '../../dbus/dbus.gyp:dbus',
+          ],
+          'export_dependent_settings': [
+            '../../build/linux/system.gyp:dbus'
           ]
         }],
         ['OS=="win"', {
@@ -105,9 +110,11 @@
             'msvs_settings': {
               'VCLinkerTool': {
                 'DelayLoadDLLs': [
+                  'BluetoothApis.dll',
                   # Despite MSDN stating that Bthprops.dll contains the
                   # symbols declared by bthprops.lib, they actually reside here:
                   'Bthprops.cpl',
+                  'setupapi.dll',
                 ],
               },
             },
@@ -123,6 +130,7 @@
       ],
     },
     {
+      # GN version: //device/bluetooth:mocks
       'target_name': 'device_bluetooth_mocks',
       'type': 'static_library',
       'dependencies': [
@@ -133,6 +141,7 @@
         '../../',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'test/mock_bluetooth_adapter.cc',
         'test/mock_bluetooth_adapter.h',
         'test/mock_bluetooth_device.cc',