device/device_tests.gyp - Issue 1415573014: Reland "Add Linux support for the Bluetooth API"

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 1415573014: Reland "Add Linux support for the Bluetooth API" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build fix. Created 5 years, 1 month 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

« device/bluetooth/bluetooth_socket_bluez.cc ('K') | « device/bluetooth/test/mock_bluetooth_advertisement.cc ('k') | extensions/browser/api/bluetooth/bluetooth_event_router.cc » ('j') | extensions/browser/api/bluetooth/bluetooth_event_router.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/device_tests.gyp

diff --git a/device/device_tests.gyp b/device/device_tests.gyp

index a49696aeaa819b46da079c85dd09747ca9702127..c7491acbc0b175cfa2545bfcba19203ad49580eb 100644

--- a/device/device_tests.gyp

+++ b/device/device_tests.gyp

@@ -36,22 +36,16 @@

'battery/battery_status_manager_win_unittest.cc',

'battery/battery_status_service_unittest.cc',

'bluetooth/bluetooth_adapter_mac_unittest.mm',

- 'bluetooth/bluetooth_adapter_profile_chromeos_unittest.cc',

'bluetooth/bluetooth_adapter_unittest.cc',

'bluetooth/bluetooth_adapter_win_unittest.cc',

- 'bluetooth/bluetooth_advertisement_chromeos_unittest.cc',

'bluetooth/bluetooth_advertisement_unittest.cc',

- 'bluetooth/bluetooth_audio_sink_chromeos_unittest.cc',

- 'bluetooth/bluetooth_chromeos_unittest.cc',

'bluetooth/bluetooth_device_unittest.cc',

'bluetooth/bluetooth_device_win_unittest.cc',

'bluetooth/bluetooth_discovery_filter_unittest.cc',

'bluetooth/bluetooth_gatt_characteristic_unittest.cc',

- 'bluetooth/bluetooth_gatt_chromeos_unittest.cc',

'bluetooth/bluetooth_gatt_service_unittest.cc',

'bluetooth/bluetooth_low_energy_win_unittest.cc',

'bluetooth/bluetooth_service_record_win_unittest.cc',

- 'bluetooth/bluetooth_socket_chromeos_unittest.cc',

'bluetooth/bluetooth_task_manager_win_unittest.cc',

'bluetooth/bluetooth_uuid_unittest.cc',

'bluetooth/test/bluetooth_test.cc',

@@ -94,15 +88,27 @@

'conditions': [

['chromeos==1', {

'dependencies': [

- '../build/linux/system.gyp:dbus',

'../chromeos/chromeos.gyp:chromeos_test_support',

'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',

- '../dbus/dbus.gyp:dbus',

'sources!': [

'battery/battery_status_manager_linux_unittest.cc',

}],

+ ['chromeos==1 or OS=="linux"', {

+ 'dependencies': [

+ '../build/linux/system.gyp:dbus',

+ '../dbus/dbus.gyp:dbus',

+ ],

+ 'sources': [

+ 'bluetooth/bluetooth_adapter_profile_bluez_unittest.cc',

+ 'bluetooth/bluetooth_advertisement_bluez_unittest.cc',

+ 'bluetooth/bluetooth_audio_sink_bluez_unittest.cc',

+ 'bluetooth/bluetooth_bluez_unittest.cc',

+ 'bluetooth/bluetooth_gatt_bluez_unittest.cc',

+ 'bluetooth/bluetooth_socket_bluez_unittest.cc',

+ ],

+ }],

['OS=="android"', {

'dependencies!': [

'../tools/usb_gadget/usb_gadget.gyp:usb_gadget',