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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluetooth.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
« no previous file with comments | « device/bluetooth/BUILD.gn ('k') | device/bluetooth/bluetooth_adapter.h » ('j') | device/bluetooth/bluetooth_adapter_bluez.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth.gyp
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
index 51595215503c35d3eb40f57d8e395a077b175141..b4f90f203bcb49699eaecdac7dcd5a3d90ab945d 100644
--- a/device/bluetooth/bluetooth.gyp
+++ b/device/bluetooth/bluetooth.gyp
@@ -32,24 +32,16 @@
'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.mm',
'bluetooth_channel_mac.h',
'bluetooth_classic_device_mac.mm',
@@ -58,8 +50,6 @@
'bluetooth_device.h',
'bluetooth_device_android.h',
'bluetooth_device_android.cc',
- 'bluetooth_device_chromeos.cc',
- 'bluetooth_device_chromeos.h',
'bluetooth_device_mac.mm',
'bluetooth_device_mac.h',
'bluetooth_device_win.cc',
@@ -75,16 +65,12 @@
'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_android.cc',
'bluetooth_gatt_notify_session_android.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',
@@ -101,26 +87,16 @@
'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_android.cc',
'bluetooth_remote_gatt_characteristic_android.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_android.cc',
'bluetooth_remote_gatt_service_android.h',
- 'bluetooth_remote_gatt_service_chromeos.cc',
- 'bluetooth_remote_gatt_service_chromeos.h',
'bluetooth_rfcomm_channel_mac.mm',
'bluetooth_rfcomm_channel_mac.h',
'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',
@@ -137,11 +113,35 @@
'conditions': [
# This block will also build for Linux once we write the linux
# implementation of BluezDbusManager.
- ['chromeos==1', {
+ ['chromeos==1 or OS=="linux"', {
'defines': [
'DEVICE_BLUETOOTH_IMPLEMENTATION',
],
'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_le_advertising_manager_client.cc',
@@ -185,6 +185,8 @@
'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_le_advertising_manager_client.cc',
@@ -224,17 +226,19 @@
'dbus/fake_bluetooth_profile_service_provider.cc',
'dbus/fake_bluetooth_profile_service_provider.h',
],
- }],
- ['chromeos==1', {
'dependencies': [
'../../build/linux/system.gyp:dbus',
- '../../chromeos/chromeos.gyp:chromeos',
'../../dbus/dbus.gyp:dbus',
],
'export_dependent_settings': [
'../../build/linux/system.gyp:dbus'
]
}],
+ ['chromeos==1', {
+ 'dependencies': [
+ '../../chromeos/chromeos.gyp:chromeos',
+ ],
+ }],
['OS == "android"', {
'dependencies': [
'device_bluetooth_java',
« no previous file with comments | « device/bluetooth/BUILD.gn ('k') | device/bluetooth/bluetooth_adapter.h » ('j') | device/bluetooth/bluetooth_adapter_bluez.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698