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

Side by Side Diff: chrome/chrome_common.gypi

Issue 492323002: Revert of Only build various flash/pnacl/ppapi code when they are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('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) 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 'variables': { 6 'variables': {
7 # File lists shared with GN build. 7 # File lists shared with GN build.
8 'chrome_common_sources': [ 8 'chrome_common_sources': [
9 '../apps/app_shim/app_shim_launch.h', 9 '../apps/app_shim/app_shim_launch.h',
10 '../apps/app_shim/app_shim_messages.h', 10 '../apps/app_shim/app_shim_messages.h',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 'common/media/webrtc_logging_message_data.cc', 142 'common/media/webrtc_logging_message_data.cc',
143 'common/media/webrtc_logging_message_data.h', 143 'common/media/webrtc_logging_message_data.h',
144 'common/media_galleries/metadata_types.h', 144 'common/media_galleries/metadata_types.h',
145 'common/multi_process_lock.h', 145 'common/multi_process_lock.h',
146 'common/multi_process_lock_linux.cc', 146 'common/multi_process_lock_linux.cc',
147 'common/multi_process_lock_mac.cc', 147 'common/multi_process_lock_mac.cc',
148 'common/multi_process_lock_win.cc', 148 'common/multi_process_lock_win.cc',
149 'common/omnibox_focus_state.h', 149 'common/omnibox_focus_state.h',
150 'common/partial_circular_buffer.cc', 150 'common/partial_circular_buffer.cc',
151 'common/partial_circular_buffer.h', 151 'common/partial_circular_buffer.h',
152 'common/pepper_flash.cc',
153 'common/pepper_flash.h',
154 'common/pepper_permission_util.cc',
155 'common/pepper_permission_util.h',
152 'common/pref_names_util.cc', 156 'common/pref_names_util.cc',
153 'common/pref_names_util.h', 157 'common/pref_names_util.h',
154 'common/prerender_types.h', 158 'common/prerender_types.h',
155 'common/print_messages.cc', 159 'common/print_messages.cc',
156 'common/print_messages.h', 160 'common/print_messages.h',
157 'common/profiling.cc', 161 'common/profiling.cc',
158 'common/profiling.h', 162 'common/profiling.h',
159 'common/ref_counted_util.h', 163 'common/ref_counted_util.h',
160 'common/render_messages.cc', 164 'common/render_messages.cc',
161 'common/render_messages.h', 165 'common/render_messages.h',
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', 368 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
365 '<(DEPTH)/components/components.gyp:autofill_core_common', 369 '<(DEPTH)/components/components.gyp:autofill_core_common',
366 '<(DEPTH)/components/components.gyp:autofill_content_common', 370 '<(DEPTH)/components/components.gyp:autofill_content_common',
367 '<(DEPTH)/components/components.gyp:password_manager_core_common', 371 '<(DEPTH)/components/components.gyp:password_manager_core_common',
368 '<(DEPTH)/components/components.gyp:signin_core_common', 372 '<(DEPTH)/components/components.gyp:signin_core_common',
369 '<(DEPTH)/components/components.gyp:translate_content_common', 373 '<(DEPTH)/components/components.gyp:translate_content_common',
370 '<(DEPTH)/components/components.gyp:visitedlink_common', 374 '<(DEPTH)/components/components.gyp:visitedlink_common',
371 '<(DEPTH)/extensions/common/api/api.gyp:extensions_api', 375 '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
372 '<(DEPTH)/extensions/extensions.gyp:extensions_common', 376 '<(DEPTH)/extensions/extensions.gyp:extensions_common',
373 '<(DEPTH)/ipc/ipc.gyp:ipc', 377 '<(DEPTH)/ipc/ipc.gyp:ipc',
378 '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h ',
374 '<(DEPTH)/third_party/re2/re2.gyp:re2', 379 '<(DEPTH)/third_party/re2/re2.gyp:re2',
375 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_ver sion_h', 380 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_ver sion_h',
376 ], 381 ],
377 'export_dependent_settings': [ 382 'export_dependent_settings': [
378 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', 383 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
379 ], 384 ],
380 }, { # OS == ios 385 }, { # OS == ios
381 'sources/': [ 386 'sources/': [
382 ['exclude', '^common/child_process_'], 387 ['exclude', '^common/child_process_'],
383 ['exclude', '^common/chrome_content_client\\.cc$'], 388 ['exclude', '^common/chrome_content_client\\.cc$'],
384 ['exclude', '^common/chrome_version_info_posix\\.cc$'], 389 ['exclude', '^common/chrome_version_info_posix\\.cc$'],
385 ['exclude', '^common/common_message_generator\\.cc$'], 390 ['exclude', '^common/common_message_generator\\.cc$'],
386 ['exclude', '^common/common_param_traits'], 391 ['exclude', '^common/common_param_traits'],
387 ['exclude', '^common/custom_handlers/'], 392 ['exclude', '^common/custom_handlers/'],
388 ['exclude', '^common/extensions/'], 393 ['exclude', '^common/extensions/'],
389 ['exclude', '^common/logging_chrome\\.'], 394 ['exclude', '^common/logging_chrome\\.'],
390 ['exclude', '^common/media_galleries/'], 395 ['exclude', '^common/media_galleries/'],
391 ['exclude', '^common/multi_process_'], 396 ['exclude', '^common/multi_process_'],
397 ['exclude', '^common/pepper_flash\\.'],
392 ['exclude', '^common/profiling\\.'], 398 ['exclude', '^common/profiling\\.'],
393 ['exclude', '^common/spellcheck_'], 399 ['exclude', '^common/spellcheck_'],
394 ['exclude', '^common/validation_message_'], 400 ['exclude', '^common/validation_message_'],
395 ['exclude', '^common/web_apps\\.'], 401 ['exclude', '^common/web_apps\\.'],
396 # TODO(ios): Include files here as they are made to work; once 402 # TODO(ios): Include files here as they are made to work; once
397 # everything is online, remove everything below here and just 403 # everything is online, remove everything below here and just
398 # use the exclusions above. 404 # use the exclusions above.
399 ['exclude', '\\.(cc|mm)$'], 405 ['exclude', '\\.(cc|mm)$'],
400 ['include', '_ios\\.(cc|mm)$'], 406 ['include', '_ios\\.(cc|mm)$'],
401 ['include', '(^|/)ios/'], 407 ['include', '(^|/)ios/'],
402 ['include', '^common/chrome_version_info\\.cc$'], 408 ['include', '^common/chrome_version_info\\.cc$'],
403 ['include', '^common/translate'], 409 ['include', '^common/translate'],
404 ['include', '^common/zip'], 410 ['include', '^common/zip'],
405 ], 411 ],
406 'include_dirs': [ 412 'include_dirs': [
407 '<(DEPTH)/breakpad/src', 413 '<(DEPTH)/breakpad/src',
408 ], 414 ],
409 }], 415 }],
410 ['disable_nacl==0', { 416 ['disable_nacl==0', {
411 'dependencies': [ 417 'dependencies': [
412 '<(DEPTH)/components/nacl.gyp:nacl_common', 418 '<(DEPTH)/components/nacl.gyp:nacl_common',
413 '<(DEPTH)/ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_tru sted_plugin', 419 '<(DEPTH)/ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_tru sted_plugin',
414 ], 420 ],
415 }], 421 }],
416 ['enable_plugins==1', {
417 'dependencies': [
418 '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h ',
419 ],
420 'sources': [
421 'common/pepper_flash.cc',
422 'common/pepper_flash.h',
423 'common/pepper_permission_util.cc',
424 'common/pepper_permission_util.h',
425 ],
426 }],
427 ['enable_printing==0', { 422 ['enable_printing==0', {
428 'sources!': [ 423 'sources!': [
429 'common/print_messages.cc', 424 'common/print_messages.cc',
430 'common/print_messages.h', 425 'common/print_messages.h',
431 ] 426 ]
432 }, { 427 }, {
433 'dependencies': [ 428 'dependencies': [
434 '<(DEPTH)/printing/printing.gyp:printing', 429 '<(DEPTH)/printing/printing.gyp:printing',
435 ], 430 ],
436 }], 431 }],
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 'common/safe_browsing/csd.proto' 694 'common/safe_browsing/csd.proto'
700 ], 695 ],
701 'variables': { 696 'variables': {
702 'proto_in_dir': 'common/safe_browsing', 697 'proto_in_dir': 'common/safe_browsing',
703 'proto_out_dir': 'chrome/common/safe_browsing', 698 'proto_out_dir': 'chrome/common/safe_browsing',
704 }, 699 },
705 'includes': [ '../build/protoc.gypi' ], 700 'includes': [ '../build/protoc.gypi' ],
706 }, 701 },
707 ], 702 ],
708 } 703 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698