Reland "Add Linux support for the Bluetooth API"

device/bluetooth/bluetooth.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 14 matching lines @@
       'sources': [
         # Note: file list duplicated in GN build.
         'android/bluetooth_jni_registrar.cc',
         'android/bluetooth_jni_registrar.h',
         'android/wrappers.cc',
         'android/wrappers.h',
         'bluetooth_adapter.cc',
         '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',
         'bluetooth_classic_device_mac.h',
         'bluetooth_device.cc',
         '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',
         'bluetooth_device_win.h',
         'bluetooth_discovery_filter.cc',
         'bluetooth_discovery_filter.h',
         'bluetooth_discovery_manager_mac.mm',
         'bluetooth_discovery_manager_mac.h',
         'bluetooth_discovery_session.cc',
         'bluetooth_discovery_session.h',
         'bluetooth_discovery_session_outcome.h',
         'bluetooth_gatt_characteristic.cc',
         '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',
         'bluetooth_init_win.h',
         'bluetooth_l2cap_channel_mac.mm',
         'bluetooth_l2cap_channel_mac.h',
         'bluetooth_low_energy_central_manager_delegate.mm',
         'bluetooth_low_energy_central_manager_delegate.h',
         'bluetooth_low_energy_defs_win.cc',
         'bluetooth_low_energy_defs_win.h',
         'bluetooth_low_energy_device_mac.h',
         'bluetooth_low_energy_device_mac.mm',
         'bluetooth_low_energy_discovery_manager_mac.h',
         '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',
         'bluetooth_socket_net.h',
         'bluetooth_socket_thread.cc',
         'bluetooth_socket_thread.h',
         'bluetooth_socket_win.cc',
         'bluetooth_socket_win.h',
         'bluetooth_task_manager_win.cc',
         'bluetooth_task_manager_win.h',
         'bluetooth_uuid.cc',
         'bluetooth_uuid.h',
       ],
       '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',
             'dbus/bluetooth_le_advertising_manager_client.h',
             'dbus/bluetooth_le_advertisement_service_provider.cc',
             'dbus/bluetooth_le_advertisement_service_provider.h',
             'dbus/bluetooth_agent_manager_client.cc',
             'dbus/bluetooth_agent_manager_client.h',
             'dbus/bluetooth_agent_service_provider.cc',
             'dbus/bluetooth_agent_service_provider.h',
@@ skipping 23 matching lines @@
             'dbus/bluetooth_media_endpoint_service_provider.h',
             'dbus/bluetooth_media_transport_client.cc',
             'dbus/bluetooth_media_transport_client.h',
             'dbus/bluetooth_profile_manager_client.cc',
             'dbus/bluetooth_profile_manager_client.h',
             'dbus/bluetooth_profile_service_provider.cc',
             'dbus/bluetooth_profile_service_provider.h',
             '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',
             'dbus/fake_bluetooth_le_advertising_manager_client.h',
             'dbus/fake_bluetooth_le_advertisement_service_provider.cc',
             'dbus/fake_bluetooth_le_advertisement_service_provider.h',
             'dbus/fake_bluetooth_agent_manager_client.cc',
             'dbus/fake_bluetooth_agent_manager_client.h',
             'dbus/fake_bluetooth_agent_service_provider.cc',
             'dbus/fake_bluetooth_agent_service_provider.h',
@@ skipping 19 matching lines @@
             'dbus/fake_bluetooth_media_client.h',
             'dbus/fake_bluetooth_media_endpoint_service_provider.cc',
             'dbus/fake_bluetooth_media_endpoint_service_provider.h',
             'dbus/fake_bluetooth_media_transport_client.cc',
             'dbus/fake_bluetooth_media_transport_client.h',
             'dbus/fake_bluetooth_profile_manager_client.cc',
             'dbus/fake_bluetooth_profile_manager_client.h',
             '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',
             'device_bluetooth_jni_headers',
           ],
         }],
         ['OS=="win"', {
           # The following two blocks are duplicated. They apply to static lib
           # and shared lib configurations respectively.
           'all_dependent_settings': {  # For static lib, apply to dependents.
@@ skipping 119 matching lines @@
           ],
           'variables': {
             'java_in_dir': '../../device/bluetooth/android/java',
           },
           'includes': [ '../../build/java.gypi' ],
         },
       ],
     }],
   ],
 }