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

Side by Side Diff: chromeos/chromeos.gyp

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'network/network_handler_callbacks.cc', 137 'network/network_handler_callbacks.cc',
138 'network/network_handler_callbacks.h', 138 'network/network_handler_callbacks.h',
139 'network/network_sms_handler.cc', 139 'network/network_sms_handler.cc',
140 'network/network_sms_handler.h', 140 'network/network_sms_handler.h',
141 'network/network_state.cc', 141 'network/network_state.cc',
142 'network/network_state.h', 142 'network/network_state.h',
143 'network/network_state_handler.cc', 143 'network/network_state_handler.cc',
144 'network/network_state_handler.h', 144 'network/network_state_handler.h',
145 'network/network_state_handler_observer.cc', 145 'network/network_state_handler_observer.cc',
146 'network/network_state_handler_observer.h', 146 'network/network_state_handler_observer.h',
147 'network/onc_constants.cc',
148 'network/onc_constants.h',
149 'network/onc_mapper.cc',
150 'network/onc_mapper.h',
151 'network/onc_merger.cc',
152 'network/onc_merger.h',
153 'network/onc_normalizer.cc',
154 'network/onc_normalizer.h',
155 'network/onc_signature.cc',
156 'network/onc_signature.h',
157 'network/onc_translation_tables.cc',
158 'network/onc_translation_tables.h',
159 'network/onc_translator.h',
160 'network/onc_translator_onc_to_shill.cc',
161 'network/onc_translator_shill_to_onc.cc',
162 'network/onc_validator.cc',
163 'network/onc_validator.h',
147 'network/shill_property_handler.cc', 164 'network/shill_property_handler.cc',
148 'network/shill_property_handler.h', 165 'network/shill_property_handler.h',
149 'network/shill_service_observer.cc', 166 'network/shill_service_observer.cc',
150 'network/shill_service_observer.h', 167 'network/shill_service_observer.h',
151 'power/power_state_override.cc', 168 'power/power_state_override.cc',
152 'power/power_state_override.h', 169 'power/power_state_override.h',
153 ], 170 ],
154 'link_settings': { 171 'link_settings': {
155 'libraries': [ 172 'libraries': [
156 '-lXext', 173 '-lXext',
157 '-lXrandr', 174 '-lXrandr',
158 ], 175 ],
159 }, 176 },
160 }, 177 },
161 { 178 {
162 # This target contains mocks that can be used to write unit tests. 179 # This target contains mocks that can be used to write unit tests.
163 'target_name': 'chromeos_test_support', 180 'target_name': 'chromeos_test_support',
164 'type': 'static_library', 181 'type': 'static_library',
165 'dependencies': [ 182 'dependencies': [
166 '../build/linux/system.gyp:dbus', 183 '../build/linux/system.gyp:dbus',
167 '../testing/gmock.gyp:gmock', 184 '../testing/gmock.gyp:gmock',
168 'chromeos', 185 'chromeos',
169 ], 186 ],
170 'sources': [ 187 'sources': [
188 'chromeos_test_utils.cc',
189 'chromeos_test_utils.h',
171 'cryptohome/mock_async_method_caller.cc', 190 'cryptohome/mock_async_method_caller.cc',
172 'cryptohome/mock_async_method_caller.h', 191 'cryptohome/mock_async_method_caller.h',
173 'dbus/mock_bluetooth_adapter_client.cc', 192 'dbus/mock_bluetooth_adapter_client.cc',
174 'dbus/mock_bluetooth_adapter_client.h', 193 'dbus/mock_bluetooth_adapter_client.h',
175 'dbus/mock_bluetooth_device_client.cc', 194 'dbus/mock_bluetooth_device_client.cc',
176 'dbus/mock_bluetooth_device_client.h', 195 'dbus/mock_bluetooth_device_client.h',
177 'dbus/mock_bluetooth_input_client.cc', 196 'dbus/mock_bluetooth_input_client.cc',
178 'dbus/mock_bluetooth_input_client.h', 197 'dbus/mock_bluetooth_input_client.h',
179 'dbus/mock_bluetooth_manager_client.cc', 198 'dbus/mock_bluetooth_manager_client.cc',
180 'dbus/mock_bluetooth_manager_client.h', 199 'dbus/mock_bluetooth_manager_client.h',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 'dbus/ibus/ibus_panel_service_unittest.cc', 314 'dbus/ibus/ibus_panel_service_unittest.cc',
296 'dbus/ibus/ibus_property_unittest.cc', 315 'dbus/ibus/ibus_property_unittest.cc',
297 'dbus/ibus/ibus_text_unittest.cc', 316 'dbus/ibus/ibus_text_unittest.cc',
298 'dbus/introspectable_client_unittest.cc', 317 'dbus/introspectable_client_unittest.cc',
299 'dbus/modem_messaging_client_unittest.cc', 318 'dbus/modem_messaging_client_unittest.cc',
300 'disks/disk_mount_manager_unittest.cc', 319 'disks/disk_mount_manager_unittest.cc',
301 'network/network_configuration_handler_unittest.cc', 320 'network/network_configuration_handler_unittest.cc',
302 'network/network_event_log_unittest.cc', 321 'network/network_event_log_unittest.cc',
303 'network/network_sms_handler_unittest.cc', 322 'network/network_sms_handler_unittest.cc',
304 'network/network_state_handler_unittest.cc', 323 'network/network_state_handler_unittest.cc',
324 'network/onc_merger_unittest.cc',
325 'network/onc_normalizer_unittest.cc',
326 'network/onc_test_utils.cc',
327 'network/onc_test_utils.h',
328 'network/onc_translator_unittest.cc',
329 'network/onc_validator_unittest.cc',
305 'network/shill_property_handler_unittest.cc', 330 'network/shill_property_handler_unittest.cc',
306 'power/power_state_override_unittest.cc', 331 'power/power_state_override_unittest.cc',
307 ], 332 ],
308 'include_dirs': [ 333 'include_dirs': [
309 '..', 334 '..',
310 ], 335 ],
311 'conditions': [ 336 'conditions': [
312 [ 'linux_use_tcmalloc==1', { 337 [ 'linux_use_tcmalloc==1', {
313 'dependencies': [ 338 'dependencies': [
314 '../base/allocator/allocator.gyp:allocator', 339 '../base/allocator/allocator.gyp:allocator',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 '../third_party/cros_system_api/dbus/video_activity_update.proto', 394 '../third_party/cros_system_api/dbus/video_activity_update.proto',
370 ], 395 ],
371 'variables': { 396 'variables': {
372 'proto_in_dir': '../third_party/cros_system_api/dbus/', 397 'proto_in_dir': '../third_party/cros_system_api/dbus/',
373 'proto_out_dir': 'chromeos/dbus', 398 'proto_out_dir': 'chromeos/dbus',
374 }, 399 },
375 'includes': ['../build/protoc.gypi'], 400 'includes': ['../build/protoc.gypi'],
376 }, 401 },
377 ], 402 ],
378 } 403 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698