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

Side by Side Diff: chrome/chrome_common.gypi

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows build fix Created 7 years, 6 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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': 'common', 8 'target_name': 'common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 10 'variables': {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 'common/child_process_logging_mac.mm', 118 'common/child_process_logging_mac.mm',
119 'common/child_process_logging_posix.cc', 119 'common/child_process_logging_posix.cc',
120 'common/child_process_logging_win.cc', 120 'common/child_process_logging_win.cc',
121 'common/chrome_content_client.cc', 121 'common/chrome_content_client.cc',
122 'common/chrome_content_client.h', 122 'common/chrome_content_client.h',
123 'common/chrome_content_client_constants.cc', 123 'common/chrome_content_client_constants.cc',
124 'common/chrome_content_client_ios.mm', 124 'common/chrome_content_client_ios.mm',
125 'common/chrome_notification_types.h', 125 'common/chrome_notification_types.h',
126 'common/chrome_result_codes.h', 126 'common/chrome_result_codes.h',
127 'common/chrome_process_type.h', 127 'common/chrome_process_type.h',
128 'common/chrome_sandbox_type_mac.h',
129 'common/chrome_utility_messages.h', 128 'common/chrome_utility_messages.h',
130 'common/chrome_version_info.cc', 129 'common/chrome_version_info.cc',
131 'common/chrome_version_info_android.cc', 130 'common/chrome_version_info_android.cc',
132 'common/chrome_version_info_chromeos.cc', 131 'common/chrome_version_info_chromeos.cc',
133 'common/chrome_version_info_posix.cc', 132 'common/chrome_version_info_posix.cc',
134 'common/chrome_version_info_mac.mm', 133 'common/chrome_version_info_mac.mm',
135 'common/chrome_version_info_win.cc', 134 'common/chrome_version_info_win.cc',
136 'common/chrome_version_info.h', 135 'common/chrome_version_info.h',
137 'common/cloud_print/cloud_print_class_mac.h', 136 'common/cloud_print/cloud_print_class_mac.h',
138 'common/cloud_print/cloud_print_class_mac.mm', 137 'common/cloud_print/cloud_print_class_mac.mm',
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 'common/metrics/metrics_util.cc', 365 'common/metrics/metrics_util.cc',
367 'common/metrics/metrics_util.h', 366 'common/metrics/metrics_util.h',
368 'common/metrics/variations/uniformity_field_trials.cc', 367 'common/metrics/variations/uniformity_field_trials.cc',
369 'common/metrics/variations/uniformity_field_trials.h', 368 'common/metrics/variations/uniformity_field_trials.h',
370 'common/metrics/variations/variations_util.cc', 369 'common/metrics/variations/variations_util.cc',
371 'common/metrics/variations/variations_util.h', 370 'common/metrics/variations/variations_util.h',
372 'common/multi_process_lock.h', 371 'common/multi_process_lock.h',
373 'common/multi_process_lock_linux.cc', 372 'common/multi_process_lock_linux.cc',
374 'common/multi_process_lock_mac.cc', 373 'common/multi_process_lock_mac.cc',
375 'common/multi_process_lock_win.cc', 374 'common/multi_process_lock_win.cc',
376 'common/nacl_cmd_line.cc', 375 'common/nacl_delegate.cc',
377 'common/nacl_cmd_line.h',
378 'common/nacl_messages.cc',
379 'common/nacl_messages.h',
380 'common/nacl_types.cc',
381 'common/nacl_types.h',
382 'common/omaha_query_params/omaha_query_params.cc', 376 'common/omaha_query_params/omaha_query_params.cc',
383 'common/omaha_query_params/omaha_query_params.h', 377 'common/omaha_query_params/omaha_query_params.h',
384 'common/omnibox_focus_state.h', 378 'common/omnibox_focus_state.h',
385 'common/one_click_signin_messages.h', 379 'common/one_click_signin_messages.h',
386 'common/partial_circular_buffer.cc', 380 'common/partial_circular_buffer.cc',
387 'common/partial_circular_buffer.h', 381 'common/partial_circular_buffer.h',
388 'common/pepper_flash.cc', 382 'common/pepper_flash.cc',
389 'common/pepper_flash.h', 383 'common/pepper_flash.h',
390 'common/pepper_permission_util.cc', 384 'common/pepper_permission_util.cc',
391 'common/pepper_permission_util.h', 385 'common/pepper_permission_util.h',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 'common/tts_utterance_request.h', 430 'common/tts_utterance_request.h',
437 'common/url_constants.cc', 431 'common/url_constants.cc',
438 'common/url_constants.h', 432 'common/url_constants.h',
439 'common/validation_message_messages.h', 433 'common/validation_message_messages.h',
440 'common/web_application_info.cc', 434 'common/web_application_info.cc',
441 'common/web_application_info.h', 435 'common/web_application_info.h',
442 'common/web_resource/web_resource_unpacker.cc', 436 'common/web_resource/web_resource_unpacker.cc',
443 'common/web_resource/web_resource_unpacker.h', 437 'common/web_resource/web_resource_unpacker.h',
444 'common/worker_thread_ticker.cc', 438 'common/worker_thread_ticker.cc',
445 'common/worker_thread_ticker.h', 439 'common/worker_thread_ticker.h',
440 '../components/nacl/common/nacl_delegate.h',
jam 2013/06/17 20:10:43 you shouldn't be listing the files from components
yael.aharon1 2013/06/19 20:38:52 Done.
441 '../components/nacl/common/nacl_messages.cc',
442 '../components/nacl/common/nacl_messages.h',
443 '../components/nacl/common/nacl_types.cc',
444 '../components/nacl/common/nacl_types.h',
446 ], 445 ],
447 'conditions': [ 446 'conditions': [
448 ['enable_extensions==1', { 447 ['enable_extensions==1', {
449 'sources!': [ 448 'sources!': [
450 'common/extensions/api/extension_api_stub.cc', 449 'common/extensions/api/extension_api_stub.cc',
451 ], 450 ],
452 'dependencies': [ 451 'dependencies': [
453 '../device/usb/usb.gyp:device_usb', 452 '../device/usb/usb.gyp:device_usb',
454 ], 453 ],
455 }, { # enable_extensions == 0 454 }, { # enable_extensions == 0
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 ['exclude', '^common/child_process_'], 490 ['exclude', '^common/child_process_'],
492 ['exclude', '^common/chrome_content_client\\.cc$'], 491 ['exclude', '^common/chrome_content_client\\.cc$'],
493 ['exclude', '^common/chrome_version_info_posix\\.cc$'], 492 ['exclude', '^common/chrome_version_info_posix\\.cc$'],
494 ['exclude', '^common/common_message_generator\\.cc$'], 493 ['exclude', '^common/common_message_generator\\.cc$'],
495 ['exclude', '^common/common_param_traits'], 494 ['exclude', '^common/common_param_traits'],
496 ['exclude', '^common/custom_handlers/'], 495 ['exclude', '^common/custom_handlers/'],
497 ['exclude', '^common/extensions/'], 496 ['exclude', '^common/extensions/'],
498 ['exclude', '^common/external_ipc_fuzzer\\.'], 497 ['exclude', '^common/external_ipc_fuzzer\\.'],
499 ['exclude', '^common/logging_chrome\\.'], 498 ['exclude', '^common/logging_chrome\\.'],
500 ['exclude', '^common/multi_process_'], 499 ['exclude', '^common/multi_process_'],
501 ['exclude', '^common/nacl_'],
502 ['exclude', '^common/pepper_flash\\.'], 500 ['exclude', '^common/pepper_flash\\.'],
503 ['exclude', '^common/profiling\\.'], 501 ['exclude', '^common/profiling\\.'],
504 ['exclude', '^common/service_process_util_'], 502 ['exclude', '^common/service_process_util_'],
505 ['exclude', '^common/spellcheck_'], 503 ['exclude', '^common/spellcheck_'],
506 ['exclude', '^common/validation_message_'], 504 ['exclude', '^common/validation_message_'],
507 ['exclude', '^common/web_apps\\.'], 505 ['exclude', '^common/web_apps\\.'],
506 ['exclude', '^../components/nacl/common/nacl_'],
508 # TODO(ios): Include files here as they are made to work; once 507 # TODO(ios): Include files here as they are made to work; once
509 # everything is online, remove everything below here and just 508 # everything is online, remove everything below here and just
510 # use the exclusions above. 509 # use the exclusions above.
511 ['exclude', '\\.(cc|mm)$'], 510 ['exclude', '\\.(cc|mm)$'],
512 ['include', '_ios\\.(cc|mm)$'], 511 ['include', '_ios\\.(cc|mm)$'],
513 ['include', '(^|/)ios/'], 512 ['include', '(^|/)ios/'],
514 ['include', '^common/chrome_version_info\\.cc$'], 513 ['include', '^common/chrome_version_info\\.cc$'],
515 ['include', '^common/zip'], 514 ['include', '^common/zip'],
516 ], 515 ],
517 'include_dirs': [ 516 'include_dirs': [
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 'common/metrics/proto/user_action_event.proto', 771 'common/metrics/proto/user_action_event.proto',
773 ], 772 ],
774 'variables': { 773 'variables': {
775 'proto_in_dir': 'common/metrics/proto', 774 'proto_in_dir': 'common/metrics/proto',
776 'proto_out_dir': 'chrome/common/metrics/proto', 775 'proto_out_dir': 'chrome/common/metrics/proto',
777 }, 776 },
778 'includes': [ '../build/protoc.gypi' ], 777 'includes': [ '../build/protoc.gypi' ],
779 }, 778 },
780 ], 779 ],
781 } 780 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698