| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 'all_dependent_settings': { # For static lib, apply to dependents. | 281 'all_dependent_settings': { # For static lib, apply to dependents. |
| 282 'msvs_settings': { | 282 'msvs_settings': { |
| 283 'VCLinkerTool': { | 283 'VCLinkerTool': { |
| 284 'DelayLoadDLLs': [ | 284 'DelayLoadDLLs': [ |
| 285 'BluetoothApis.dll', | 285 'BluetoothApis.dll', |
| 286 # Despite MSDN stating that Bthprops.dll contains the | 286 # Despite MSDN stating that Bthprops.dll contains the |
| 287 # symbols declared by bthprops.lib, they actually reside here: | 287 # symbols declared by bthprops.lib, they actually reside here: |
| 288 'Bthprops.cpl', | 288 'Bthprops.cpl', |
| 289 'setupapi.dll', | 289 'setupapi.dll', |
| 290 ], | 290 ], |
| 291 'AdditionalDependencies': [ |
| 292 # Bthprops must be listed before BluetoothApis or else delay |
| 293 # loading crashes. |
| 294 'Bthprops.lib', |
| 295 'BluetoothApis.lib', |
| 296 ], |
| 291 }, | 297 }, |
| 292 }, | 298 }, |
| 293 }, | 299 }, |
| 294 'msvs_settings': { # For shared lib, apply to self. | 300 'msvs_settings': { # For shared lib, apply to self. |
| 295 'VCLinkerTool': { | 301 'VCLinkerTool': { |
| 296 'DelayLoadDLLs': [ | 302 'DelayLoadDLLs': [ |
| 297 'BluetoothApis.dll', | 303 'BluetoothApis.dll', |
| 298 # Despite MSDN stating that Bthprops.dll contains the | 304 # Despite MSDN stating that Bthprops.dll contains the |
| 299 # symbols declared by bthprops.lib, they actually reside here: | 305 # symbols declared by bthprops.lib, they actually reside here: |
| 300 'Bthprops.cpl', | 306 'Bthprops.cpl', |
| 301 'setupapi.dll', | 307 'setupapi.dll', |
| 302 ], | 308 ], |
| 309 'AdditionalDependencies': [ |
| 310 # Bthprops must be listed before BluetoothApis or else delay |
| 311 # loading crashes. |
| 312 'Bthprops.lib', |
| 313 'BluetoothApis.lib', |
| 314 ], |
| 303 }, | 315 }, |
| 304 }, | 316 }, |
| 305 }], | 317 }], |
| 306 ['OS=="mac"', { | 318 ['OS=="mac"', { |
| 307 'link_settings': { | 319 'link_settings': { |
| 308 'libraries': [ | 320 'libraries': [ |
| 309 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', | 321 '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework', |
| 310 ], | 322 ], |
| 311 'conditions': [ | 323 'conditions': [ |
| 312 ['mac_sdk == "10.10"', { | 324 ['mac_sdk == "10.10"', { |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 ], | 412 ], |
| 401 'variables': { | 413 'variables': { |
| 402 'java_in_dir': '../../device/bluetooth/android/java', | 414 'java_in_dir': '../../device/bluetooth/android/java', |
| 403 }, | 415 }, |
| 404 'includes': [ '../../build/java.gypi' ], | 416 'includes': [ '../../build/java.gypi' ], |
| 405 }, | 417 }, |
| 406 ], | 418 ], |
| 407 }], | 419 }], |
| 408 ], | 420 ], |
| 409 } | 421 } |
| OLD | NEW |