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

Side by Side Diff: chromeos/chromeos.gyp

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 'dbus/cryptohome_client.cc', 53 'dbus/cryptohome_client.cc',
54 'dbus/cryptohome_client.h', 54 'dbus/cryptohome_client.h',
55 'dbus/dbus_client_implementation_type.h', 55 'dbus/dbus_client_implementation_type.h',
56 'dbus/dbus_method_call_status.h', 56 'dbus/dbus_method_call_status.h',
57 'dbus/dbus_thread_manager.cc', 57 'dbus/dbus_thread_manager.cc',
58 'dbus/dbus_thread_manager.h', 58 'dbus/dbus_thread_manager.h',
59 'dbus/debug_daemon_client.cc', 59 'dbus/debug_daemon_client.cc',
60 'dbus/debug_daemon_client.h', 60 'dbus/debug_daemon_client.h',
61 'dbus/gsm_sms_client.cc', 61 'dbus/gsm_sms_client.cc',
62 'dbus/gsm_sms_client.h', 62 'dbus/gsm_sms_client.h',
63 'dbus/flimflam_ipconfig_client.cc', 63 'dbus/shill_ipconfig_client.cc',
64 'dbus/flimflam_ipconfig_client.h', 64 'dbus/shill_ipconfig_client.h',
65 'dbus/flimflam_client_helper.cc', 65 'dbus/shill_client_helper.cc',
66 'dbus/flimflam_client_helper.h', 66 'dbus/shill_client_helper.h',
67 'dbus/flimflam_device_client.cc', 67 'dbus/shill_device_client.cc',
68 'dbus/flimflam_device_client.h', 68 'dbus/shill_device_client.h',
69 'dbus/flimflam_manager_client.cc', 69 'dbus/shill_manager_client.cc',
70 'dbus/flimflam_manager_client.h', 70 'dbus/shill_manager_client.h',
71 'dbus/flimflam_network_client.cc', 71 'dbus/shill_network_client.cc',
72 'dbus/flimflam_network_client.h', 72 'dbus/shill_network_client.h',
73 'dbus/flimflam_profile_client.cc', 73 'dbus/shill_profile_client.cc',
74 'dbus/flimflam_profile_client.h', 74 'dbus/shill_profile_client.h',
75 'dbus/flimflam_service_client.cc', 75 'dbus/shill_service_client.cc',
76 'dbus/flimflam_service_client.h', 76 'dbus/shill_service_client.h',
77 'dbus/ibus/ibus_client.cc', 77 'dbus/ibus/ibus_client.cc',
78 'dbus/ibus/ibus_client.h', 78 'dbus/ibus/ibus_client.h',
79 'dbus/ibus/ibus_component.cc', 79 'dbus/ibus/ibus_component.cc',
80 'dbus/ibus/ibus_component.h', 80 'dbus/ibus/ibus_component.h',
81 'dbus/ibus/ibus_constants.h', 81 'dbus/ibus/ibus_constants.h',
82 'dbus/ibus/ibus_engine_service.cc', 82 'dbus/ibus/ibus_engine_service.cc',
83 'dbus/ibus/ibus_engine_service.h', 83 'dbus/ibus/ibus_engine_service.h',
84 'dbus/ibus/ibus_engine_factory_service.cc', 84 'dbus/ibus/ibus_engine_factory_service.cc',
85 'dbus/ibus/ibus_engine_factory_service.h', 85 'dbus/ibus/ibus_engine_factory_service.h',
86 'dbus/ibus/ibus_lookup_table.cc', 86 'dbus/ibus/ibus_lookup_table.cc',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 'dbus/mock_cashew_client.cc', 155 'dbus/mock_cashew_client.cc',
156 'dbus/mock_cashew_client.h', 156 'dbus/mock_cashew_client.h',
157 'dbus/mock_cros_disks_client.cc', 157 'dbus/mock_cros_disks_client.cc',
158 'dbus/mock_cros_disks_client.h', 158 'dbus/mock_cros_disks_client.h',
159 'dbus/mock_cryptohome_client.cc', 159 'dbus/mock_cryptohome_client.cc',
160 'dbus/mock_cryptohome_client.h', 160 'dbus/mock_cryptohome_client.h',
161 'dbus/mock_dbus_thread_manager.cc', 161 'dbus/mock_dbus_thread_manager.cc',
162 'dbus/mock_dbus_thread_manager.h', 162 'dbus/mock_dbus_thread_manager.h',
163 'dbus/mock_debug_daemon_client.cc', 163 'dbus/mock_debug_daemon_client.cc',
164 'dbus/mock_debug_daemon_client.h', 164 'dbus/mock_debug_daemon_client.h',
165 'dbus/mock_flimflam_device_client.cc', 165 'dbus/mock_shill_device_client.cc',
166 'dbus/mock_flimflam_device_client.h', 166 'dbus/mock_shill_device_client.h',
167 'dbus/mock_flimflam_ipconfig_client.cc', 167 'dbus/mock_shill_ipconfig_client.cc',
168 'dbus/mock_flimflam_ipconfig_client.h', 168 'dbus/mock_shill_ipconfig_client.h',
169 'dbus/mock_flimflam_manager_client.cc', 169 'dbus/mock_shill_manager_client.cc',
170 'dbus/mock_flimflam_manager_client.h', 170 'dbus/mock_shill_manager_client.h',
171 'dbus/mock_flimflam_network_client.cc', 171 'dbus/mock_shill_network_client.cc',
172 'dbus/mock_flimflam_network_client.h', 172 'dbus/mock_shill_network_client.h',
173 'dbus/mock_flimflam_profile_client.cc', 173 'dbus/mock_shill_profile_client.cc',
174 'dbus/mock_flimflam_profile_client.h', 174 'dbus/mock_shill_profile_client.h',
175 'dbus/mock_flimflam_service_client.cc', 175 'dbus/mock_shill_service_client.cc',
176 'dbus/mock_flimflam_service_client.h', 176 'dbus/mock_shill_service_client.h',
177 'dbus/mock_gsm_sms_client.cc', 177 'dbus/mock_gsm_sms_client.cc',
178 'dbus/mock_gsm_sms_client.h', 178 'dbus/mock_gsm_sms_client.h',
179 'dbus/mock_image_burner_client.cc', 179 'dbus/mock_image_burner_client.cc',
180 'dbus/mock_image_burner_client.h', 180 'dbus/mock_image_burner_client.h',
181 'dbus/mock_introspectable_client.cc', 181 'dbus/mock_introspectable_client.cc',
182 'dbus/mock_introspectable_client.h', 182 'dbus/mock_introspectable_client.h',
183 'dbus/mock_media_transfer_protocol_daemon_client.cc', 183 'dbus/mock_media_transfer_protocol_daemon_client.cc',
184 'dbus/mock_media_transfer_protocol_daemon_client.h', 184 'dbus/mock_media_transfer_protocol_daemon_client.h',
185 'dbus/mock_modem_messaging_client.cc', 185 'dbus/mock_modem_messaging_client.cc',
186 'dbus/mock_modem_messaging_client.h', 186 'dbus/mock_modem_messaging_client.h',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 '../base/base.gyp:run_all_unittests', 233 '../base/base.gyp:run_all_unittests',
234 '../base/base.gyp:test_support_base', 234 '../base/base.gyp:test_support_base',
235 '../build/linux/system.gyp:dbus', 235 '../build/linux/system.gyp:dbus',
236 '../dbus/dbus.gyp:dbus_test_support', 236 '../dbus/dbus.gyp:dbus_test_support',
237 '../testing/gmock.gyp:gmock', 237 '../testing/gmock.gyp:gmock',
238 '../testing/gtest.gyp:gtest', 238 '../testing/gtest.gyp:gtest',
239 'chromeos_test_support', 239 'chromeos_test_support',
240 ], 240 ],
241 'sources': [ 241 'sources': [
242 'dbus/blocking_method_caller_unittest.cc', 242 'dbus/blocking_method_caller_unittest.cc',
243 'dbus/flimflam_client_unittest_base.cc', 243 'dbus/shill_client_unittest_base.cc',
244 'dbus/flimflam_client_unittest_base.h', 244 'dbus/shill_client_unittest_base.h',
245 'dbus/flimflam_device_client_unittest.cc', 245 'dbus/shill_device_client_unittest.cc',
246 'dbus/flimflam_ipconfig_client_unittest.cc', 246 'dbus/shill_ipconfig_client_unittest.cc',
247 'dbus/flimflam_manager_client_unittest.cc', 247 'dbus/shill_manager_client_unittest.cc',
248 'dbus/flimflam_network_client_unittest.cc', 248 'dbus/shill_network_client_unittest.cc',
249 'dbus/flimflam_profile_client_unittest.cc', 249 'dbus/shill_profile_client_unittest.cc',
250 'dbus/flimflam_service_client_unittest.cc', 250 'dbus/shill_service_client_unittest.cc',
251 'dbus/gsm_sms_client_unittest.cc', 251 'dbus/gsm_sms_client_unittest.cc',
252 'dbus/ibus/ibus_client_unittest.cc', 252 'dbus/ibus/ibus_client_unittest.cc',
253 'dbus/ibus/ibus_component_unittest.cc', 253 'dbus/ibus/ibus_component_unittest.cc',
254 'dbus/ibus/ibus_engine_factory_service_unittest.cc', 254 'dbus/ibus/ibus_engine_factory_service_unittest.cc',
255 'dbus/ibus/ibus_engine_service_unittest.cc', 255 'dbus/ibus/ibus_engine_service_unittest.cc',
256 'dbus/ibus/ibus_input_context_client_unittest.cc', 256 'dbus/ibus/ibus_input_context_client_unittest.cc',
257 'dbus/ibus/ibus_lookup_table_unittest.cc', 257 'dbus/ibus/ibus_lookup_table_unittest.cc',
258 'dbus/ibus/ibus_object_unittest.cc', 258 'dbus/ibus/ibus_object_unittest.cc',
259 'dbus/ibus/ibus_property_unittest.cc', 259 'dbus/ibus/ibus_property_unittest.cc',
260 'dbus/ibus/ibus_text_unittest.cc', 260 'dbus/ibus/ibus_text_unittest.cc',
(...skipping 28 matching lines...) Expand all
289 '../third_party/cros_system_api/dbus/power_supply_properties.proto', 289 '../third_party/cros_system_api/dbus/power_supply_properties.proto',
290 ], 290 ],
291 'variables': { 291 'variables': {
292 'proto_in_dir': '../third_party/cros_system_api/dbus/', 292 'proto_in_dir': '../third_party/cros_system_api/dbus/',
293 'proto_out_dir': 'chromeos/dbus', 293 'proto_out_dir': 'chromeos/dbus',
294 }, 294 },
295 'includes': ['../build/protoc.gypi'], 295 'includes': ['../build/protoc.gypi'],
296 }, 296 },
297 ], 297 ],
298 } 298 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698