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

Unified Diff: device/BUILD.gn

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
Index: device/BUILD.gn
diff --git a/device/BUILD.gn b/device/BUILD.gn
index bb27c5aeeb87b22ce3f66f1b0f055f8a7d5366eb..0a61c72c8d72329d8e90cb6a0653403f80c4a1ac 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -30,22 +30,16 @@ test("device_unittests") {
"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",
@@ -146,16 +140,28 @@ test("device_unittests") {
}
if (is_chromeos) {
- configs += [ "//build/config/linux:dbus" ]
-
deps += [
"//chromeos",
"//chromeos:test_support",
"//chromeos:test_support_without_gmock",
- "//dbus",
]
}
+ if (is_chromeos || is_linux) {
+ configs += [ "//build/config/linux: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",
+ ]
+
+ deps += [ "//dbus" ]
+ }
+
if (is_posix && !is_android && !is_mac) {
libs = [ "rt" ]
}

Powered by Google App Engine
This is Rietveld 408576698