Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: device/bluetooth/bluetooth.gyp

Issue 1101513003: mac: Weakly link against the CoreBluetooth framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments from rsesek. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth.gyp
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
index 1e4f7edadbe1b3cdb4112c1e3b696b7ce3123993..ee671f528902bfbdafe61032a219bcc04c1d7784 100644
--- a/device/bluetooth/bluetooth.gyp
+++ b/device/bluetooth/bluetooth.gyp
@@ -152,6 +152,19 @@
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
],
+ 'conditions': [
+ ['mac_sdk == "10.10"', {
+ 'xcode_settings': {
+ # In the OSX 10.10 SDK, CoreBluetooth became a top level
+ # framework. Previously, it was nested in IOBluetooth. In
+ # order for Chrome to run on OSes older than OSX 10.10, the
+ # top level CoreBluetooth framework must be weakly linked.
+ 'OTHER_LDFLAGS': [
+ '-weak_framework CoreBluetooth',
+ ],
+ },
+ }],
+ ],
},
}],
],
« no previous file with comments | « device/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698