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

Unified Diff: chrome/chrome_common.gypi

Issue 494993005: Only build various flash/pnacl/ppapi code when they are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index ddf250aba010e1a3faf297dced947710c0d52727..1be2c43f9490365c5cc0e07689dfaf1ed4e6c004 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -149,10 +149,6 @@
'common/omnibox_focus_state.h',
'common/partial_circular_buffer.cc',
'common/partial_circular_buffer.h',
- 'common/pepper_flash.cc',
- 'common/pepper_flash.h',
- 'common/pepper_permission_util.cc',
- 'common/pepper_permission_util.h',
'common/pref_names_util.cc',
'common/pref_names_util.h',
'common/prerender_types.h',
@@ -376,7 +372,6 @@
'<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
'<(DEPTH)/extensions/extensions.gyp:extensions_common',
'<(DEPTH)/ipc/ipc.gyp:ipc',
- '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
'<(DEPTH)/third_party/re2/re2.gyp:re2',
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
],
@@ -395,7 +390,6 @@
['exclude', '^common/logging_chrome\\.'],
['exclude', '^common/media_galleries/'],
['exclude', '^common/multi_process_'],
- ['exclude', '^common/pepper_flash\\.'],
['exclude', '^common/profiling\\.'],
['exclude', '^common/spellcheck_'],
['exclude', '^common/validation_message_'],
@@ -420,6 +414,17 @@
'<(DEPTH)/ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_plugin',
],
}],
+ ['enable_plugins==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+ ],
+ 'sources': [
+ 'common/pepper_flash.cc',
+ 'common/pepper_flash.h',
+ 'common/pepper_permission_util.cc',
+ 'common/pepper_permission_util.h',
+ ],
+ }],
['enable_printing==0', {
'sources!': [
'common/print_messages.cc',
« 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