diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 17:07:38 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 17:09:07 +0000 |
| commit | 03cd489f2764f5e0be89177dafe06fbd7b9e3a2c (patch) | |
| tree | 0c05fb70c75f280b4e31c351286c654e654b3513 /chrome/chrome_common.gypi | |
| parent | 1bb001059e2e1420ef095b0fd15b9d9199cf366e (diff) | |
| download | chromium_src-03cd489f2764f5e0be89177dafe06fbd7b9e3a2c.zip chromium_src-03cd489f2764f5e0be89177dafe06fbd7b9e3a2c.tar.gz chromium_src-03cd489f2764f5e0be89177dafe06fbd7b9e3a2c.tar.bz2 | |
Revert of Only build various flash/pnacl/ppapi code when they are enabled. (patchset #7 of https://codereview.chromium.org/471263003/)
Reason for revert:
Suspected of breaking the disable_nacl build.
Original issue's description:
> Only build various flash/pnacl/ppapi code when they are enabled.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291069
TBR=dyen@chromium.org,viettrungluu@chromium.org,thestig@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/492323002
Cr-Commit-Position: refs/heads/master@{#291112}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 61719ac..e41ab38 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -149,6 +149,10 @@ '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', @@ -371,6 +375,7 @@ '<(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', ], @@ -389,6 +394,7 @@ ['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_'], @@ -413,17 +419,6 @@ '<(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', |