| Index: device/bluetooth/bluetooth.gyp
|
| diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
|
| index d6b8c7e95a61108dd9d6a905c8a1ed8d7577a278..c9562243ecfa939de96470ad06268836cce10ea5 100644
|
| --- a/device/bluetooth/bluetooth.gyp
|
| +++ b/device/bluetooth/bluetooth.gyp
|
| @@ -10,13 +10,16 @@
|
| {
|
| # GN version: //device/bluetooth
|
| 'target_name': 'device_bluetooth',
|
| - 'type': 'static_library',
|
| + 'type': '<(component)',
|
| 'dependencies': [
|
| '../../base/base.gyp:base',
|
| '../../net/net.gyp:net',
|
| '../../ui/base/ui_base.gyp:ui_base',
|
| 'bluetooth_strings.gyp:device_bluetooth_strings',
|
| ],
|
| + 'defines': [
|
| + 'DEVICE_BLUETOOTH_IMPLEMENTATION',
|
| + ],
|
| 'sources': [
|
| # Note: file list duplicated in GN build.
|
| 'bluetooth_adapter.cc',
|
| @@ -106,7 +109,9 @@
|
| ]
|
| }],
|
| ['OS=="win"', {
|
| - 'all_dependent_settings': {
|
| + # The following two blocks are duplicated. They apply to static lib
|
| + # and shared lib configurations respectively.
|
| + 'all_dependent_settings': { # For static lib, apply to dependents.
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| 'DelayLoadDLLs': [
|
| @@ -119,6 +124,17 @@
|
| },
|
| },
|
| },
|
| + 'msvs_settings': { # For shared lib, apply to self.
|
| + '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',
|
| + ],
|
| + },
|
| + },
|
| }],
|
| ['OS=="mac"', {
|
| 'link_settings': {
|
|
|