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

Side by Side 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, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 'ui_compositor_image_transport%': 1, 893 'ui_compositor_image_transport%': 1,
894 }, { 894 }, {
895 'ui_compositor_image_transport%': 0, 895 'ui_compositor_image_transport%': 0,
896 }], 896 }],
897 897
898 # Turn precompiled headers on by default. 898 # Turn precompiled headers on by default.
899 ['OS=="win" and buildtype!="Official"', { 899 ['OS=="win" and buildtype!="Official"', {
900 'chromium_win_pch%': 1 900 'chromium_win_pch%': 1
901 }], 901 }],
902 902
903 # Whether PDF plugin is enabled.
904 ['OS=="android" or OS=="ios" or (embedded==1 and chromecast==0)', {
905 'enable_pdf%': 0,
906 }, {
907 'enable_pdf%': 1,
908 }],
909
903 ['chromeos==1 or OS=="android" or OS=="ios" or desktop_linux==1', { 910 ['chromeos==1 or OS=="android" or OS=="ios" or desktop_linux==1', {
904 'enable_plugin_installation%': 0, 911 'enable_plugin_installation%': 0,
905 }, { 912 }, {
906 'enable_plugin_installation%': 1, 913 'enable_plugin_installation%': 1,
907 }], 914 }],
908 915
909 # Whether PPAPI is enabled. 916 # Whether PPAPI is enabled.
910 ['OS=="android" or OS=="ios" or (embedded==1 and chromecast==0)', { 917 ['OS=="android" or OS=="ios" or (embedded==1 and chromecast==0)', {
911 'enable_plugins%': 0, 918 'enable_plugins%': 0,
912 }, { 919 }, {
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 'ubsan_vptr_blacklist%': '<(ubsan_vptr_blacklist)', 1204 'ubsan_vptr_blacklist%': '<(ubsan_vptr_blacklist)',
1198 'ubsan_vptr%': '<(ubsan_vptr)', 1205 'ubsan_vptr%': '<(ubsan_vptr)',
1199 'use_instrumented_libraries%': '<(use_instrumented_libraries)', 1206 'use_instrumented_libraries%': '<(use_instrumented_libraries)',
1200 'use_prebuilt_instrumented_libraries%': '<(use_prebuilt_instrumented_librari es)', 1207 'use_prebuilt_instrumented_libraries%': '<(use_prebuilt_instrumented_librari es)',
1201 'use_custom_libcxx%': '<(use_custom_libcxx)', 1208 'use_custom_libcxx%': '<(use_custom_libcxx)',
1202 'use_system_libcxx%': '<(use_system_libcxx)', 1209 'use_system_libcxx%': '<(use_system_libcxx)',
1203 'clang_type_profiler%': '<(clang_type_profiler)', 1210 'clang_type_profiler%': '<(clang_type_profiler)',
1204 'order_profiling%': '<(order_profiling)', 1211 'order_profiling%': '<(order_profiling)',
1205 'order_text_section%': '<(order_text_section)', 1212 'order_text_section%': '<(order_text_section)',
1206 'enable_extensions%': '<(enable_extensions)', 1213 'enable_extensions%': '<(enable_extensions)',
1214 'enable_pdf%': '<(enable_pdf)',
1207 'enable_plugin_installation%': '<(enable_plugin_installation)', 1215 'enable_plugin_installation%': '<(enable_plugin_installation)',
1208 'enable_plugins%': '<(enable_plugins)', 1216 'enable_plugins%': '<(enable_plugins)',
1209 'enable_session_service%': '<(enable_session_service)', 1217 'enable_session_service%': '<(enable_session_service)',
1210 'enable_themes%': '<(enable_themes)', 1218 'enable_themes%': '<(enable_themes)',
1211 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 1219 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
1212 'enable_prod_wallet_service%': '<(enable_prod_wallet_service)', 1220 'enable_prod_wallet_service%': '<(enable_prod_wallet_service)',
1213 'enable_background%': '<(enable_background)', 1221 'enable_background%': '<(enable_background)',
1214 'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', 1222 'linux_use_bundled_gold%': '<(linux_use_bundled_gold)',
1215 'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)', 1223 'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)',
1216 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 1224 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
(...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after
2979 'defines': [ 2987 'defines': [
2980 'ENABLE_EXTENSIONS=1', 2988 'ENABLE_EXTENSIONS=1',
2981 ], 2989 ],
2982 }], 2990 }],
2983 ['OS=="win" and branding=="Chrome"', { 2991 ['OS=="win" and branding=="Chrome"', {
2984 'defines': ['ENABLE_SWIFTSHADER'], 2992 'defines': ['ENABLE_SWIFTSHADER'],
2985 }], 2993 }],
2986 ['enable_dart==1', { 2994 ['enable_dart==1', {
2987 'defines': ['WEBKIT_USING_DART=1'], 2995 'defines': ['WEBKIT_USING_DART=1'],
2988 }], 2996 }],
2997 ['enable_pdf==1', {
2998 'defines': ['ENABLE_PDF=1'],
2999 }],
2989 ['enable_plugin_installation==1', { 3000 ['enable_plugin_installation==1', {
2990 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'], 3001 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
2991 }], 3002 }],
2992 ['enable_plugins==1', { 3003 ['enable_plugins==1', {
2993 'defines': ['ENABLE_PLUGINS=1'], 3004 'defines': ['ENABLE_PLUGINS=1'],
2994 }], 3005 }],
2995 ['enable_session_service==1', { 3006 ['enable_session_service==1', {
2996 'defines': ['ENABLE_SESSION_SERVICE=1'], 3007 'defines': ['ENABLE_SESSION_SERVICE=1'],
2997 }], 3008 }],
2998 ['enable_themes==1', { 3009 ['enable_themes==1', {
(...skipping 3314 matching lines...) Expand 10 before | Expand all | Expand 10 after
6313 # settings in target dicts. SYMROOT is a special case, because many other 6324 # settings in target dicts. SYMROOT is a special case, because many other
6314 # Xcode variables depend on it, including variables such as 6325 # Xcode variables depend on it, including variables such as
6315 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6326 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6316 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6327 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6317 # files to appear (when present) in the UI as actual files and not red 6328 # files to appear (when present) in the UI as actual files and not red
6318 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6329 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6319 # and therefore SYMROOT, needs to be set at the project level. 6330 # and therefore SYMROOT, needs to be set at the project level.
6320 'SYMROOT': '<(DEPTH)/xcodebuild', 6331 'SYMROOT': '<(DEPTH)/xcodebuild',
6321 }, 6332 },
6322 } 6333 }
OLDNEW
« 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