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

Side by Side Diff: chromeos/chromeos.gyp

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added IsBluetoothSupported() in bluetooth_api.cc Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'chromeos', 11 'target_name': 'chromeos',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../base/base.gyp:base', 14 '../base/base.gyp:base',
15 '../build/linux/system.gyp:dbus', 15 '../build/linux/system.gyp:dbus',
16 '../dbus/dbus.gyp:dbus', 16 '../dbus/dbus.gyp:dbus',
17 '../device/device.gyp:bluetooth_out_of_band_pairing_data',
17 '../net/net.gyp:net', 18 '../net/net.gyp:net',
18 '../third_party/libxml/libxml.gyp:libxml', 19 '../third_party/libxml/libxml.gyp:libxml',
19 'mtp_file_entry_proto', 20 'mtp_file_entry_proto',
20 'mtp_storage_info_proto', 21 'mtp_storage_info_proto',
21 'power_state_control_proto', 22 'power_state_control_proto',
22 'power_supply_properties_proto', 23 'power_supply_properties_proto',
23 'video_activity_update_proto', 24 'video_activity_update_proto',
24 ], 25 ],
25 'defines': [ 26 'defines': [
26 'CHROMEOS_IMPLEMENTATION', 27 'CHROMEOS_IMPLEMENTATION',
(...skipping 13 matching lines...) Expand all
40 'dbus/bluetooth_device_client.cc', 41 'dbus/bluetooth_device_client.cc',
41 'dbus/bluetooth_device_client.h', 42 'dbus/bluetooth_device_client.h',
42 'dbus/bluetooth_input_client.cc', 43 'dbus/bluetooth_input_client.cc',
43 'dbus/bluetooth_input_client.h', 44 'dbus/bluetooth_input_client.h',
44 'dbus/bluetooth_manager_client.cc', 45 'dbus/bluetooth_manager_client.cc',
45 'dbus/bluetooth_manager_client.h', 46 'dbus/bluetooth_manager_client.h',
46 'dbus/bluetooth_node_client.cc', 47 'dbus/bluetooth_node_client.cc',
47 'dbus/bluetooth_node_client.h', 48 'dbus/bluetooth_node_client.h',
48 'dbus/bluetooth_out_of_band_client.cc', 49 'dbus/bluetooth_out_of_band_client.cc',
49 'dbus/bluetooth_out_of_band_client.h', 50 'dbus/bluetooth_out_of_band_client.h',
50 'dbus/bluetooth_out_of_band_pairing_data.h',
51 'dbus/bluetooth_property.cc', 51 'dbus/bluetooth_property.cc',
52 'dbus/bluetooth_property.h', 52 'dbus/bluetooth_property.h',
53 'dbus/cashew_client.cc', 53 'dbus/cashew_client.cc',
54 'dbus/cashew_client.h', 54 'dbus/cashew_client.h',
55 'dbus/cros_disks_client.cc', 55 'dbus/cros_disks_client.cc',
56 'dbus/cros_disks_client.h', 56 'dbus/cros_disks_client.h',
57 'dbus/cryptohome_client.cc', 57 'dbus/cryptohome_client.cc',
58 'dbus/cryptohome_client.h', 58 'dbus/cryptohome_client.h',
59 'dbus/dbus_client_implementation_type.h', 59 'dbus/dbus_client_implementation_type.h',
60 'dbus/dbus_method_call_status.h', 60 'dbus/dbus_method_call_status.h',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 '-lXrandr', 134 '-lXrandr',
135 ], 135 ],
136 }, 136 },
137 }, 137 },
138 { 138 {
139 # This target contains mocks that can be used to write unit tests. 139 # This target contains mocks that can be used to write unit tests.
140 'target_name': 'chromeos_test_support', 140 'target_name': 'chromeos_test_support',
141 'type': 'static_library', 141 'type': 'static_library',
142 'dependencies': [ 142 'dependencies': [
143 '../build/linux/system.gyp:dbus', 143 '../build/linux/system.gyp:dbus',
144 '../device/device.gyp:bluetooth_out_of_band_pairing_data',
144 '../testing/gmock.gyp:gmock', 145 '../testing/gmock.gyp:gmock',
145 'chromeos', 146 'chromeos',
146 'mtp_file_entry_proto', 147 'mtp_file_entry_proto',
147 ], 148 ],
148 'sources': [ 149 'sources': [
149 'cryptohome/mock_async_method_caller.cc', 150 'cryptohome/mock_async_method_caller.cc',
150 'cryptohome/mock_async_method_caller.h', 151 'cryptohome/mock_async_method_caller.h',
151 'dbus/mock_bluetooth_adapter_client.cc', 152 'dbus/mock_bluetooth_adapter_client.cc',
152 'dbus/mock_bluetooth_adapter_client.h', 153 'dbus/mock_bluetooth_adapter_client.h',
153 'dbus/mock_bluetooth_device_client.cc', 154 'dbus/mock_bluetooth_device_client.cc',
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 '../third_party/cros_system_api/dbus/video_activity_update.proto', 353 '../third_party/cros_system_api/dbus/video_activity_update.proto',
353 ], 354 ],
354 'variables': { 355 'variables': {
355 'proto_in_dir': '../third_party/cros_system_api/dbus/', 356 'proto_in_dir': '../third_party/cros_system_api/dbus/',
356 'proto_out_dir': 'chromeos/dbus', 357 'proto_out_dir': 'chromeos/dbus',
357 }, 358 },
358 'includes': ['../build/protoc.gypi'], 359 'includes': ['../build/protoc.gypi'],
359 }, 360 },
360 ], 361 ],
361 } 362 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698