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

Unified Diff: device/BUILD.gn

Issue 1056313004: mac: Weakly link against the CoreBluetooth framework. (attempt #2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only add mac include on macs. 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 | « no previous file | device/bluetooth/bluetooth.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/BUILD.gn
diff --git a/device/BUILD.gn b/device/BUILD.gn
index 3bf6fa77878d31482b8f299773bb4a027d5cba20..ba522909a652d9a61bdbb73605a3ca88c9624007 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -5,6 +5,10 @@
import("//build/config/features.gni")
import("//testing/test.gni")
+if (is_mac) {
+ import("//build/config/mac/mac_sdk.gni")
+}
+
is_linux_without_udev = is_linux && !use_udev
is_linux_without_dbus = is_linux && !use_dbus
@@ -112,5 +116,13 @@ test("device_unittests") {
if (is_mac) {
libs = [ "IOBluetooth.framework" ]
+
+ # 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.
+ if (mac_sdk_version == "10.10") {
+ ldflags = [ "-weak_framework CoreBluetooth" ]
+ }
}
}
« no previous file with comments | « no previous file | device/bluetooth/bluetooth.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698