diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 08:29:14 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 08:29:14 +0000 |
| commit | 50d3c4a4f6943bfbd07c5d4a4614023f86877a99 (patch) | |
| tree | f64c1659eae7a3db266eccdc3a68803aecddd072 /build/common.gypi | |
| parent | f13a21332d8eba5f0ecf481f9247afc6046bdf2e (diff) | |
| download | chromium_src-50d3c4a4f6943bfbd07c5d4a4614023f86877a99.zip chromium_src-50d3c4a4f6943bfbd07c5d4a4614023f86877a99.tar.gz chromium_src-50d3c4a4f6943bfbd07c5d4a4614023f86877a99.tar.bz2 | |
Cleanup: Simplify enable_plugin gyp flag and remove an obsolete TODO.
Review URL: https://codereview.chromium.org/242303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index cbf994d..e233086 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -495,11 +495,6 @@ # Enable plug-in installation by default. 'enable_plugin_installation%': 1, - # Enable PPAPI and NPAPI by default. - # TODO(nileshagrawal): Make this flag enable/disable NPAPI as well - # as PPAPI; see crbug.com/162667. - 'enable_plugins%': 1, - # Specifies whether to use canvas_skia.cc in place of platform # specific implementations of gfx::Canvas. Affects text drawing in the # Chrome UI. @@ -720,6 +715,7 @@ 'enable_plugin_installation%': 1, }], + # Whether PPAPI is enabled. ['OS=="android" or OS=="ios" or embedded==1', { 'enable_plugins%': 0, }, { @@ -1363,7 +1359,7 @@ # TODO(glider): set clang to 1 earlier for ASan and TSan builds so # that it takes effect here. ['clang==0 and asan==0 and lsan==0 and tsan==0 and msan==0', { - 'binutils_version%': '<!pymod_do_main(compiler_version assembler)', + 'binutils_version%': '<!pymod_do_main(compiler_version assembler)', }], # On Android we know the binutils version in the toolchain. ['OS=="android"', { |