diff options
| author | thestig <thestig@chromium.org> | 2014-08-25 17:32:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 00:35:05 +0000 |
| commit | 11b815e9520584215b940e28c7c8f121d7a7afad (patch) | |
| tree | fb96b07c1695a7395495bfadcde7056dd677bfbd /chrome/chrome_browser_ui.gypi | |
| parent | f032b471042c2a93d504c5fdeb8a685dd06e8962 (diff) | |
| download | chromium_src-11b815e9520584215b940e28c7c8f121d7a7afad.zip chromium_src-11b815e9520584215b940e28c7c8f121d7a7afad.tar.gz chromium_src-11b815e9520584215b940e28c7c8f121d7a7afad.tar.bz2 | |
Only build various flash/pnacl/ppapi code when they are enabled. (try 2)
Review URL: https://codereview.chromium.org/494993005
Cr-Commit-Position: refs/heads/master@{#291810}
Diffstat (limited to 'chrome/chrome_browser_ui.gypi')
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 4c6f734..f53b548 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -1059,8 +1059,6 @@ 'browser/ui/webui/fileicon_source.h', 'browser/ui/webui/flags_ui.cc', 'browser/ui/webui/flags_ui.h', - 'browser/ui/webui/flash_ui.cc', - 'browser/ui/webui/flash_ui.h', 'browser/ui/webui/gcm_internals_ui.cc', 'browser/ui/webui/gcm_internals_ui.h', 'browser/ui/webui/history_ui.cc', @@ -1854,6 +1852,8 @@ 'chrome_browser_ui_plugin_sources': [ 'browser/ui/hung_plugin_tab_helper.cc', 'browser/ui/hung_plugin_tab_helper.h', + 'browser/ui/webui/flash_ui.cc', + 'browser/ui/webui/flash_ui.h', ], 'chrome_browser_ui_policy_sources': [ 'browser/ui/webui/policy_ui.cc', @@ -2621,7 +2621,6 @@ '../media/media.gyp:media', '../mojo/mojo_base.gyp:mojo_system_impl', '../net/net.gyp:net_with_v8', - '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', '../third_party/expat/expat.gyp:expat', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libjingle/libjingle.gyp:libjingle', @@ -2680,6 +2679,7 @@ 'sources': [ '<@(chrome_browser_ui_plugin_sources)' ], 'dependencies': [ '../ppapi/ppapi_internal.gyp:ppapi_ipc', + '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', ], }], ['safe_browsing==1', { |