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

Unified Diff: build/common.gypi

Issue 242303003: Cleanup: Simplify enable_plugin gyp flag and remove an obsolete TODO. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 264390)
+++ build/common.gypi (working copy)
@@ -506,11 +506,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.
@@ -731,6 +726,7 @@
'enable_plugin_installation%': 1,
}],
+ # Whether PPAPI is enabled.
['OS=="android" or OS=="ios" or embedded==1', {
'enable_plugins%': 0,
}, {
@@ -1376,7 +1372,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"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698