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

Unified Diff: device/device_tests.gyp

Issue 1216583003: Adding Hashed Address to BluetoothLowEnergyDeviceMac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@timeinfo
Patch Set: Created 5 years, 6 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
Index: device/device_tests.gyp
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index b3299b80706e1ed66dd58da8e3335e6bfd813bb3..ea79eb53b31c3ab12415921ee4500879280229fd 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -17,6 +17,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
'../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../third_party/ocmock/ocmock.gyp:ocmock',
'../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
'battery/battery.gyp:device_battery',
'battery/battery.gyp:device_battery_mojo_bindings',
@@ -113,6 +114,11 @@
'$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
],
},
+ 'xcode_settings' : {
+ 'OTHER_LDFLAGS' : [
+ '-ObjC',
krstnmnlsn 2015/07/01 16:45:50 Is there an equivalent flag needed in the .gn file
scheib 2015/07/01 17:29:44 Probably. I'm not familiar with the flag, but I se
krstnmnlsn 2015/07/02 00:25:30 Ok. For some reason I missed those.
+ ],
+ },
}],
['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [

Powered by Google App Engine
This is Rietveld 408576698