device/device_tests.gyp - Issue 1216583003: Adding Hashed Address to BluetoothLowEnergyDeviceMac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: arman comments Created 5 years, 5 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 66ce52929b99f7768f7e7b478e656092c4115315..0de24a27aaeef9150a5beb351069a1bc15409028 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',

@@ -118,6 +119,11 @@

'$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',

+ 'xcode_settings' : {

+ 'OTHER_LDFLAGS' : [

+ '-ObjC',

+ ],

+ },

}],

['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {

'conditions': [

« device/bluetooth/bluetooth_low_energy_device_mac.h ('K') | « device/bluetooth/bluetooth_low_energy_device_mac.mm ('k') | no next file » | no next file with comments »