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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix chrome_tests.gypi error Created 8 years, 8 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
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 'browser/chromeos/cros_settings.cc', 461 'browser/chromeos/cros_settings.cc',
462 'browser/chromeos/cros_settings.h', 462 'browser/chromeos/cros_settings.h',
463 'browser/chromeos/cros_settings_names.cc', 463 'browser/chromeos/cros_settings_names.cc',
464 'browser/chromeos/cros_settings_names.h', 464 'browser/chromeos/cros_settings_names.h',
465 'browser/chromeos/cros_settings_provider.cc', 465 'browser/chromeos/cros_settings_provider.cc',
466 'browser/chromeos/cros_settings_provider.h', 466 'browser/chromeos/cros_settings_provider.h',
467 'browser/chromeos/cryptohome/async_method_caller.cc', 467 'browser/chromeos/cryptohome/async_method_caller.cc',
468 'browser/chromeos/cryptohome/async_method_caller.h', 468 'browser/chromeos/cryptohome/async_method_caller.h',
469 'browser/chromeos/customization_document.cc', 469 'browser/chromeos/customization_document.cc',
470 'browser/chromeos/customization_document.h', 470 'browser/chromeos/customization_document.h',
471 'browser/chromeos/dbus/blocking_method_caller.cc',
472 'browser/chromeos/dbus/blocking_method_caller.h',
473 'browser/chromeos/dbus/bluetooth_adapter_client.cc',
474 'browser/chromeos/dbus/bluetooth_adapter_client.h',
475 'browser/chromeos/dbus/bluetooth_agent_service_provider.cc',
476 'browser/chromeos/dbus/bluetooth_agent_service_provider.h',
477 'browser/chromeos/dbus/bluetooth_device_client.cc',
478 'browser/chromeos/dbus/bluetooth_device_client.h',
479 'browser/chromeos/dbus/bluetooth_input_client.cc',
480 'browser/chromeos/dbus/bluetooth_input_client.h',
481 'browser/chromeos/dbus/bluetooth_manager_client.cc',
482 'browser/chromeos/dbus/bluetooth_manager_client.h',
483 'browser/chromeos/dbus/bluetooth_node_client.cc',
484 'browser/chromeos/dbus/bluetooth_node_client.h',
485 'browser/chromeos/dbus/bluetooth_property.cc',
486 'browser/chromeos/dbus/bluetooth_property.h',
487 'browser/chromeos/dbus/cashew_client.cc',
488 'browser/chromeos/dbus/cashew_client.h',
489 'browser/chromeos/dbus/cros_disks_client.cc',
490 'browser/chromeos/dbus/cros_disks_client.h',
491 'browser/chromeos/dbus/cryptohome_client.cc',
492 'browser/chromeos/dbus/cryptohome_client.h',
493 'browser/chromeos/dbus/cros_dbus_service.cc', 471 'browser/chromeos/dbus/cros_dbus_service.cc',
494 'browser/chromeos/dbus/cros_dbus_service.h', 472 'browser/chromeos/dbus/cros_dbus_service.h',
495 'browser/chromeos/dbus/dbus_client_implementation_type.h',
496 'browser/chromeos/dbus/dbus_thread_manager.cc',
497 'browser/chromeos/dbus/dbus_thread_manager.h',
498 'browser/chromeos/dbus/flimflam_ipconfig_client.cc',
499 'browser/chromeos/dbus/flimflam_ipconfig_client.h',
500 'browser/chromeos/dbus/flimflam_client_helper.cc',
501 'browser/chromeos/dbus/flimflam_client_helper.h',
502 'browser/chromeos/dbus/flimflam_network_client.cc',
503 'browser/chromeos/dbus/flimflam_network_client.h',
504 'browser/chromeos/dbus/flimflam_profile_client.cc',
505 'browser/chromeos/dbus/flimflam_profile_client.h',
506 'browser/chromeos/dbus/image_burner_client.cc',
507 'browser/chromeos/dbus/image_burner_client.h',
508 'browser/chromeos/dbus/introspectable_client.cc',
509 'browser/chromeos/dbus/introspectable_client.h',
510 'browser/chromeos/dbus/introspect_util.cc', 473 'browser/chromeos/dbus/introspect_util.cc',
511 'browser/chromeos/dbus/introspect_util.h', 474 'browser/chromeos/dbus/introspect_util.h',
512 'browser/chromeos/dbus/power_manager_client.cc',
513 'browser/chromeos/dbus/power_manager_client.h',
514 'browser/chromeos/dbus/proxy_resolution_service_provider.cc', 475 'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
515 'browser/chromeos/dbus/proxy_resolution_service_provider.h', 476 'browser/chromeos/dbus/proxy_resolution_service_provider.h',
516 'browser/chromeos/dbus/session_manager_client.cc',
517 'browser/chromeos/dbus/session_manager_client.h',
518 'browser/chromeos/dbus/speech_synthesizer_client.cc',
519 'browser/chromeos/dbus/speech_synthesizer_client.h',
520 'browser/chromeos/dbus/update_engine_client.cc',
521 'browser/chromeos/dbus/update_engine_client.h',
522 'browser/chromeos/disks/disk_mount_manager.cc', 477 'browser/chromeos/disks/disk_mount_manager.cc',
523 'browser/chromeos/disks/disk_mount_manager.h', 478 'browser/chromeos/disks/disk_mount_manager.h',
524 'browser/chromeos/enrollment_dialog_view.cc', 479 'browser/chromeos/enrollment_dialog_view.cc',
525 'browser/chromeos/enrollment_dialog_view.h', 480 'browser/chromeos/enrollment_dialog_view.h',
526 'browser/chromeos/enterprise_extension_observer.cc', 481 'browser/chromeos/enterprise_extension_observer.cc',
527 'browser/chromeos/enterprise_extension_observer.h', 482 'browser/chromeos/enterprise_extension_observer.h',
528 'browser/chromeos/extensions/bluetooth_event_router.cc', 483 'browser/chromeos/extensions/bluetooth_event_router.cc',
529 'browser/chromeos/extensions/bluetooth_event_router.h', 484 'browser/chromeos/extensions/bluetooth_event_router.h',
530 'browser/chromeos/extensions/file_browser_event_router.cc', 485 'browser/chromeos/extensions/file_browser_event_router.cc',
531 'browser/chromeos/extensions/file_browser_event_router.h', 486 'browser/chromeos/extensions/file_browser_event_router.h',
(...skipping 3673 matching lines...) Expand 10 before | Expand all | Expand 10 after
4205 ['exclude', '^browser/chromeos/audio/audio_mixer_cras.h'], 4160 ['exclude', '^browser/chromeos/audio/audio_mixer_cras.h'],
4206 ], 4161 ],
4207 }], 4162 }],
4208 ], 4163 ],
4209 'dependencies': [ 4164 'dependencies': [
4210 '../build/linux/system.gyp:dbus-glib', 4165 '../build/linux/system.gyp:dbus-glib',
4211 '../chromeos/chromeos.gyp:chromeos', 4166 '../chromeos/chromeos.gyp:chromeos',
4212 '../third_party/libevent/libevent.gyp:libevent', 4167 '../third_party/libevent/libevent.gyp:libevent',
4213 '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp: mozc_candidates_proto', 4168 '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp: mozc_candidates_proto',
4214 'browser/chromeos/input_method/input_method.gyp:gencode', 4169 'browser/chromeos/input_method/input_method.gyp:gencode',
4215 'power_supply_properties_proto',
4216 'power_state_control_proto',
4217 ], 4170 ],
4218 'sources!': [ 4171 'sources!': [
4219 'browser/first_run/upgrade_util.cc', 4172 'browser/first_run/upgrade_util.cc',
4220 'browser/first_run/upgrade_util.h', 4173 'browser/first_run/upgrade_util.h',
4221 'browser/first_run/upgrade_util_linux.cc', 4174 'browser/first_run/upgrade_util_linux.cc',
4222 'browser/icon_loader_linux.cc', 4175 'browser/icon_loader_linux.cc',
4223 'browser/icon_manager_linux.cc', 4176 'browser/icon_manager_linux.cc',
4224 'browser/idle_linux.cc', 4177 'browser/idle_linux.cc',
4225 'browser/password_manager/native_backend_gnome_x.cc', 4178 'browser/password_manager/native_backend_gnome_x.cc',
4226 'browser/password_manager/native_backend_gnome_x.h', 4179 'browser/password_manager/native_backend_gnome_x.h',
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
5261 # protocol buffer. 5214 # protocol buffer.
5262 'target_name': 'in_memory_url_index_cache_proto', 5215 'target_name': 'in_memory_url_index_cache_proto',
5263 'type': 'static_library', 5216 'type': 'static_library',
5264 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5217 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5265 'variables': { 5218 'variables': {
5266 'proto_in_dir': 'browser/history', 5219 'proto_in_dir': 'browser/history',
5267 'proto_out_dir': 'chrome/browser/history', 5220 'proto_out_dir': 'chrome/browser/history',
5268 }, 5221 },
5269 'includes': [ '../build/protoc.gypi' ] 5222 'includes': [ '../build/protoc.gypi' ]
5270 }, 5223 },
5271 {
5272 # Protobuf compiler / generator for the PowerSupplyProperties protocol
5273 # buffer.
5274 'target_name': 'power_supply_properties_proto',
5275 'type': 'static_library',
5276 'conditions': [
5277 ['chromeos==1', {
5278 'sources': [
5279 '../third_party/cros_system_api/dbus/power_supply_properties.proto',
5280 ],
5281 'variables': {
5282 'proto_in_dir': '../third_party/cros_system_api/dbus/',
5283 'proto_out_dir': 'chrome/browser/chromeos/dbus',
5284 },
5285 'includes': ['../build/protoc.gypi'],
5286 }],
5287 ],
5288 },
5289 {
5290 # Protobuf compiler / generator for the PowerSupplyProperties protocol
5291 # buffer.
5292 'target_name': 'power_state_control_proto',
5293 'type': 'static_library',
5294 'conditions': [
5295 ['chromeos==1', {
5296 'sources': [
5297 '../third_party/cros_system_api/dbus/power_state_control.proto',
5298 ],
5299 'variables': {
5300 'proto_in_dir': '../third_party/cros_system_api/dbus/',
5301 'proto_out_dir': 'chrome/browser/chromeos/dbus',
5302 },
5303 'includes': ['../build/protoc.gypi'],
5304 }],
5305 ],
5306 },
5307 ], 5224 ],
5308 } 5225 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698