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

Unified Diff: device/bluetooth/BUILD.gn

Issue 1367663002: Add Linux support for the Bluetooth API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor_dbus
Patch Set: rebase Created 5 years, 3 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 | « device/BUILD.gn ('k') | device/bluetooth/bluetooth.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/BUILD.gn
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 69da108b9b7357b6499f0155d86d510dfe60b8aa..b7bd5f87b70cb9f2bc6f29059c1620218401c6ba 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -29,24 +29,16 @@ component("bluetooth") {
"bluetooth_adapter.h",
"bluetooth_adapter_android.cc",
"bluetooth_adapter_android.h",
- "bluetooth_adapter_chromeos.cc",
- "bluetooth_adapter_chromeos.h",
"bluetooth_adapter_factory.cc",
"bluetooth_adapter_factory.h",
"bluetooth_adapter_mac.h",
"bluetooth_adapter_mac.mm",
- "bluetooth_adapter_profile_chromeos.cc",
- "bluetooth_adapter_profile_chromeos.h",
"bluetooth_adapter_win.cc",
"bluetooth_adapter_win.h",
"bluetooth_advertisement.cc",
"bluetooth_advertisement.h",
- "bluetooth_advertisement_chromeos.cc",
- "bluetooth_advertisement_chromeos.h",
"bluetooth_audio_sink.cc",
"bluetooth_audio_sink.h",
- "bluetooth_audio_sink_chromeos.cc",
- "bluetooth_audio_sink_chromeos.h",
"bluetooth_channel_mac.h",
"bluetooth_channel_mac.mm",
"bluetooth_classic_device_mac.h",
@@ -55,8 +47,6 @@ component("bluetooth") {
"bluetooth_device.h",
"bluetooth_device_android.cc",
"bluetooth_device_android.h",
- "bluetooth_device_chromeos.cc",
- "bluetooth_device_chromeos.h",
"bluetooth_device_mac.h",
"bluetooth_device_mac.mm",
"bluetooth_device_win.cc",
@@ -72,14 +62,10 @@ component("bluetooth") {
"bluetooth_gatt_characteristic.h",
"bluetooth_gatt_connection.cc",
"bluetooth_gatt_connection.h",
- "bluetooth_gatt_connection_chromeos.cc",
- "bluetooth_gatt_connection_chromeos.h",
"bluetooth_gatt_descriptor.cc",
"bluetooth_gatt_descriptor.h",
"bluetooth_gatt_notify_session.cc",
"bluetooth_gatt_notify_session.h",
- "bluetooth_gatt_notify_session_chromeos.cc",
- "bluetooth_gatt_notify_session_chromeos.h",
"bluetooth_gatt_service.cc",
"bluetooth_gatt_service.h",
"bluetooth_init_win.cc",
@@ -96,22 +82,12 @@ component("bluetooth") {
"bluetooth_low_energy_discovery_manager_mac.mm",
"bluetooth_low_energy_win.cc",
"bluetooth_low_energy_win.h",
- "bluetooth_pairing_chromeos.cc",
- "bluetooth_pairing_chromeos.h",
- "bluetooth_remote_gatt_characteristic_chromeos.cc",
- "bluetooth_remote_gatt_characteristic_chromeos.h",
- "bluetooth_remote_gatt_descriptor_chromeos.cc",
- "bluetooth_remote_gatt_descriptor_chromeos.h",
- "bluetooth_remote_gatt_service_chromeos.cc",
- "bluetooth_remote_gatt_service_chromeos.h",
"bluetooth_rfcomm_channel_mac.h",
"bluetooth_rfcomm_channel_mac.mm",
"bluetooth_service_record_win.cc",
"bluetooth_service_record_win.h",
"bluetooth_socket.cc",
"bluetooth_socket.h",
- "bluetooth_socket_chromeos.cc",
- "bluetooth_socket_chromeos.h",
"bluetooth_socket_mac.h",
"bluetooth_socket_mac.mm",
"bluetooth_socket_net.cc",
@@ -144,10 +120,11 @@ component("bluetooth") {
}
if (is_chromeos) {
- deps += [
- "//chromeos",
- "//dbus",
- ]
+ deps += [ "//chromeos" ]
+ }
+
+ if (is_chromeos || is_linux) {
+ deps += [ "//dbus" ]
}
if (is_mac) {
@@ -158,11 +135,32 @@ component("bluetooth") {
libs = [ "setupapi.lib" ]
}
- # This block will also build for Linux once we write the linux
- # implementation of BluezDbusManager.
- if (is_chromeos) {
- defines += [ "DEVICE_BLUETOOTH_IMPLEMENTATION" ]
+ if (is_chromeos || is_linux) {
sources += [
+ "bluetooth_adapter_bluez.cc",
+ "bluetooth_adapter_bluez.h",
+ "bluetooth_adapter_profile_bluez.cc",
+ "bluetooth_adapter_profile_bluez.h",
+ "bluetooth_advertisement_bluez.cc",
+ "bluetooth_advertisement_bluez.h",
+ "bluetooth_audio_sink_bluez.cc",
+ "bluetooth_audio_sink_bluez.h",
+ "bluetooth_device_bluez.cc",
+ "bluetooth_device_bluez.h",
+ "bluetooth_gatt_connection_bluez.cc",
+ "bluetooth_gatt_connection_bluez.h",
+ "bluetooth_gatt_notify_session_bluez.cc",
+ "bluetooth_gatt_notify_session_bluez.h",
+ "bluetooth_pairing_bluez.cc",
+ "bluetooth_pairing_bluez.h",
+ "bluetooth_remote_gatt_characteristic_bluez.cc",
+ "bluetooth_remote_gatt_characteristic_bluez.h",
+ "bluetooth_remote_gatt_descriptor_bluez.cc",
+ "bluetooth_remote_gatt_descriptor_bluez.h",
+ "bluetooth_remote_gatt_service_bluez.cc",
+ "bluetooth_remote_gatt_service_bluez.h",
+ "bluetooth_socket_bluez.cc",
+ "bluetooth_socket_bluez.h",
"dbus/bluetooth_adapter_client.cc",
"dbus/bluetooth_adapter_client.h",
"dbus/bluetooth_agent_manager_client.cc",
@@ -206,6 +204,8 @@ component("bluetooth") {
"dbus/bluez_dbus_client.h",
"dbus/bluez_dbus_manager.cc",
"dbus/bluez_dbus_manager.h",
+ "dbus/dbus_thread_manager_linux.cc",
+ "dbus/dbus_thread_manager_linux.h",
"dbus/fake_bluetooth_adapter_client.cc",
"dbus/fake_bluetooth_adapter_client.h",
"dbus/fake_bluetooth_agent_manager_client.cc",
« no previous file with comments | « device/BUILD.gn ('k') | device/bluetooth/bluetooth.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698