Chromium Code Reviews Chromium Code Reviews
Issue 9838085:
Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed)
Base URL: http://git.chromium.org/chromium/src.git@master| OLD | NEW |
|---|---|
| 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', | |
| 16 '../dbus/dbus.gyp:dbus', | |
| 17 'power_state_control_proto', | |
| 18 'power_supply_properties_proto', | |
| 15 ], | 19 ], |
| 16 'sources': [ | 20 'sources': [ |
| 17 'chromeos_export.h', | 21 'chromeos_export.h', |
| 22 'dbus/blocking_method_caller.cc', | |
| 23 'dbus/blocking_method_caller.h', | |
| 24 'dbus/bluetooth_adapter_client.cc', | |
| 25 'dbus/bluetooth_adapter_client.h', | |
| 26 'dbus/bluetooth_agent_service_provider.cc', | |
| 27 'dbus/bluetooth_agent_service_provider.h', | |
| 28 'dbus/bluetooth_device_client.cc', | |
| 29 'dbus/bluetooth_device_client.h', | |
| 30 'dbus/bluetooth_input_client.cc', | |
| 31 'dbus/bluetooth_input_client.h', | |
| 32 'dbus/bluetooth_manager_client.cc', | |
| 33 'dbus/bluetooth_manager_client.h', | |
| 34 'dbus/bluetooth_node_client.cc', | |
| 35 'dbus/bluetooth_node_client.h', | |
| 36 'dbus/bluetooth_property.cc', | |
| 37 'dbus/bluetooth_property.h', | |
| 38 'dbus/cashew_client.cc', | |
| 39 'dbus/cashew_client.h', | |
| 40 'dbus/cros_disks_client.cc', | |
| 41 'dbus/cros_disks_client.h', | |
| 42 'dbus/cryptohome_client.cc', | |
| 43 'dbus/cryptohome_client.h', | |
| 44 'dbus/dbus_client_implementation_type.h', | |
| 45 'dbus/dbus_method_call_status.h', | |
| 46 'dbus/dbus_thread_manager.cc', | |
| 47 'dbus/dbus_thread_manager.h', | |
| 48 'dbus/flimflam_ipconfig_client.cc', | |
| 49 'dbus/flimflam_ipconfig_client.h', | |
| 50 'dbus/flimflam_client_helper.cc', | |
| 51 'dbus/flimflam_client_helper.h', | |
| 52 'dbus/flimflam_network_client.cc', | |
| 53 'dbus/flimflam_network_client.h', | |
| 54 'dbus/flimflam_profile_client.cc', | |
| 55 'dbus/flimflam_profile_client.h', | |
| 56 'dbus/image_burner_client.cc', | |
| 57 'dbus/image_burner_client.h', | |
| 58 'dbus/introspectable_client.cc', | |
| 59 'dbus/introspectable_client.h', | |
| 60 'dbus/power_manager_client.cc', | |
| 61 'dbus/power_manager_client.h', | |
| 18 'dbus/power_supply_status.cc', | 62 'dbus/power_supply_status.cc', |
| 19 'dbus/power_supply_status.h', | 63 'dbus/power_supply_status.h', |
| 64 'dbus/session_manager_client.cc', | |
| 65 'dbus/session_manager_client.h', | |
| 66 'dbus/speech_synthesizer_client.cc', | |
| 67 'dbus/speech_synthesizer_client.h', | |
| 68 'dbus/update_engine_client.cc', | |
| 69 'dbus/update_engine_client.h', | |
| 20 ], | 70 ], |
| 21 }, | 71 }, |
| 22 ] | 72 { |
| 73 # This target contains mocks that can be used to write unit tests. | |
| 74 'target_name': 'chromeos_test_support', | |
| 75 'type': 'static_library', | |
| 76 'dependencies': [ | |
| 77 '../build/linux/system.gyp:dbus', | |
| 78 '../testing/gmock.gyp:gmock', | |
| 79 'chromeos', | |
| 80 ], | |
| 81 'sources': [ | |
| 82 'dbus/mock_bluetooth_adapter_client.cc', | |
| 83 'dbus/mock_bluetooth_adapter_client.h', | |
| 84 'dbus/mock_bluetooth_device_client.cc', | |
| 85 'dbus/mock_bluetooth_device_client.h', | |
| 86 'dbus/mock_bluetooth_input_client.cc', | |
| 87 'dbus/mock_bluetooth_input_client.h', | |
| 88 'dbus/mock_bluetooth_manager_client.cc', | |
| 89 'dbus/mock_bluetooth_manager_client.h', | |
| 90 'dbus/mock_bluetooth_node_client.cc', | |
| 91 'dbus/mock_bluetooth_node_client.h', | |
| 92 'dbus/mock_cros_disks_client.cc', | |
| 93 'dbus/mock_cros_disks_client.h', | |
| 94 'dbus/mock_cashew_client.cc', | |
| 95 'dbus/mock_cashew_client.h', | |
| 96 'dbus/mock_cryptohome_client.cc', | |
| 97 'dbus/mock_cryptohome_client.h', | |
| 98 'dbus/mock_dbus_thread_manager.cc', | |
| 99 'dbus/mock_dbus_thread_manager.h', | |
| 100 'dbus/mock_flimflam_ipconfig_client.cc', | |
| 101 'dbus/mock_flimflam_ipconfig_client.h', | |
| 102 'dbus/mock_flimflam_network_client.cc', | |
| 103 'dbus/mock_flimflam_network_client.h', | |
| 104 'dbus/mock_flimflam_profile_client.cc', | |
| 105 'dbus/mock_flimflam_profile_client.h', | |
| 106 'dbus/mock_image_burner_client.cc', | |
| 107 'dbus/mock_image_burner_client.h', | |
| 108 'dbus/mock_introspectable_client.cc', | |
| 109 'dbus/mock_introspectable_client.h', | |
| 110 'dbus/mock_power_manager_client.cc', | |
| 111 'dbus/mock_power_manager_client.h', | |
| 112 'dbus/mock_session_manager_client.cc', | |
| 113 'dbus/mock_session_manager_client.h', | |
| 114 'dbus/mock_speech_synthesizer_client.cc', | |
| 115 'dbus/mock_speech_synthesizer_client.h', | |
| 116 'dbus/mock_update_engine_client.cc', | |
| 117 'dbus/mock_update_engine_client.h', | |
| 118 ], | |
| 119 'include_dirs': [ | |
| 120 '..', | |
| 121 ], | |
| 122 }, | |
| 123 { | |
| 124 'target_name': 'chromeos_unittests', | |
|
oshima
2012/04/05 23:30:46
add this to aura_builder target, and please file a
hashimoto
2012/04/06 00:19:24
Added.
Where should I file a request, crbug.com?
oshima
2012/04/06 00:38:49
yes, assign it to petermayo with label Build-Infra
hashimoto
2012/04/06 00:52:02
Filed http://crbug.com/122279
| |
| 125 'type': 'executable', | |
| 126 'dependencies': [ | |
| 127 '../base/base.gyp:run_all_unittests', | |
| 128 '../base/base.gyp:test_support_base', | |
| 129 '../build/linux/system.gyp:dbus', | |
| 130 '../dbus/dbus.gyp:dbus_test_support', | |
| 131 '../testing/gmock.gyp:gmock', | |
| 132 '../testing/gtest.gyp:gtest', | |
| 133 'chromeos_test_support', | |
| 134 ], | |
| 135 'sources': [ | |
| 136 'dbus/blocking_method_caller_unittest.cc', | |
| 137 'dbus/flimflam_client_unittest_base.cc', | |
| 138 'dbus/flimflam_client_unittest_base.h', | |
| 139 'dbus/flimflam_network_client_unittest.cc', | |
| 140 ], | |
| 141 'include_dirs': [ | |
| 142 '..', | |
| 143 ], | |
| 144 }, | |
| 145 { | |
| 146 # Protobuf compiler / generator for the PowerSupplyProperties protocol | |
| 147 # buffer. | |
| 148 'target_name': 'power_state_control_proto', | |
| 149 'type': 'static_library', | |
| 150 'sources': [ | |
| 151 '../third_party/cros_system_api/dbus/power_state_control.proto', | |
| 152 ], | |
| 153 'variables': { | |
| 154 'proto_in_dir': '../third_party/cros_system_api/dbus/', | |
| 155 'proto_out_dir': 'chromeos/dbus', | |
| 156 }, | |
| 157 'includes': ['../build/protoc.gypi'], | |
| 158 }, | |
| 159 { | |
| 160 # Protobuf compiler / generator for the PowerSupplyProperties protocol | |
| 161 # buffer. | |
| 162 'target_name': 'power_supply_properties_proto', | |
| 163 'type': 'static_library', | |
| 164 'sources': [ | |
| 165 '../third_party/cros_system_api/dbus/power_supply_properties.proto', | |
| 166 ], | |
| 167 'variables': { | |
| 168 'proto_in_dir': '../third_party/cros_system_api/dbus/', | |
| 169 'proto_out_dir': 'chromeos/dbus', | |
| 170 }, | |
| 171 'includes': ['../build/protoc.gypi'], | |
| 172 }, | |
| 173 ], | |
| 23 } | 174 } |
| OLD | NEW |
