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

Unified Diff: build/common.gypi

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tryjob failures: forgot to set/check ENABLE_PDF in a couple places. Created 5 years, 4 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 | build/config/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index b58fede74469c9d22504ed5c30cf6f3e238fc13f..92852a6eddd2d40d967fd53049f59367f74bae0d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -900,6 +900,13 @@
'chromium_win_pch%': 1
}],
+ # Whether PDF plugin is enabled.
+ ['OS=="android" or OS=="ios" or (embedded==1 and chromecast==0)', {
+ 'enable_pdf%': 0,
+ }, {
+ 'enable_pdf%': 1,
+ }],
+
['chromeos==1 or OS=="android" or OS=="ios" or desktop_linux==1', {
'enable_plugin_installation%': 0,
}, {
@@ -1204,6 +1211,7 @@
'order_profiling%': '<(order_profiling)',
'order_text_section%': '<(order_text_section)',
'enable_extensions%': '<(enable_extensions)',
+ 'enable_pdf%': '<(enable_pdf)',
'enable_plugin_installation%': '<(enable_plugin_installation)',
'enable_plugins%': '<(enable_plugins)',
'enable_session_service%': '<(enable_session_service)',
@@ -2986,6 +2994,9 @@
['enable_dart==1', {
'defines': ['WEBKIT_USING_DART=1'],
}],
+ ['enable_pdf==1', {
+ 'defines': ['ENABLE_PDF=1'],
+ }],
['enable_plugin_installation==1', {
'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
}],
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698