diff options
| author | tommycli <tommycli@chromium.org> | 2015-06-11 15:20:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-11 22:21:17 +0000 |
| commit | 425d6965196e7448a2ba9180a3fd2f5b08f5b329 (patch) | |
| tree | 0799c08a8aa683b6196ebbf7f3963b29731abbcc /components/plugins.gypi | |
| parent | 60b17299b23088c43179c092a26977cdb294b0da (diff) | |
| download | chromium_src-425d6965196e7448a2ba9180a3fd2f5b08f5b329.zip chromium_src-425d6965196e7448a2ba9180a3fd2f5b08f5b329.tar.gz chromium_src-425d6965196e7448a2ba9180a3fd2f5b08f5b329.tar.bz2 | |
Reland: Plugin Placeholders: Refactor for platforms that don't support plugins
This patch removes a lot of plugin placeholder code from builds that don't support plugins (enable_plugins==0).
This is a reland of https://codereview.chromium.org/1126073003/.
See patchsets for fixes of the crashes.
BUG=493889
TBR=
Review URL: https://codereview.chromium.org/1161923004
Cr-Commit-Position: refs/heads/master@{#334054}
Diffstat (limited to 'components/plugins.gypi')
| -rw-r--r-- | components/plugins.gypi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/components/plugins.gypi b/components/plugins.gypi index fde25c6..9061833 100644 --- a/components/plugins.gypi +++ b/components/plugins.gypi @@ -36,14 +36,19 @@ ], 'sources': [ # Note: sources list duplicated in GN build. - 'plugins/renderer/loadable_plugin_placeholder.cc', - 'plugins/renderer/loadable_plugin_placeholder.h', 'plugins/renderer/plugin_placeholder.cc', 'plugins/renderer/plugin_placeholder.h', 'plugins/renderer/webview_plugin.cc', 'plugins/renderer/webview_plugin.h', ], 'conditions' : [ + ['enable_plugins==1', { + 'sources': [ + # Note: sources list duplicated in GN build. + 'plugins/renderer/loadable_plugin_placeholder.cc', + 'plugins/renderer/loadable_plugin_placeholder.h', + ] + }], ['OS=="android"', { 'sources': [ # Note: sources list duplicated in GN build. |