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

Side by Side Diff: build/config/BUILD.gn

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 | « build/common.gypi ('k') | build/config/features.gni » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 import("//build/config/allocator.gni") 5 import("//build/config/allocator.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/sanitizers/sanitizers.gni") 9 import("//build/config/sanitizers/sanitizers.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 # TODO(brettw) should probably be "=1" 61 # TODO(brettw) should probably be "=1"
62 defines += [ "ENABLE_PEPPER_CDMS" ] 62 defines += [ "ENABLE_PEPPER_CDMS" ]
63 } 63 }
64 if (enable_browser_cdms) { 64 if (enable_browser_cdms) {
65 # TODO(brettw) should probably be "=1" 65 # TODO(brettw) should probably be "=1"
66 defines += [ "ENABLE_BROWSER_CDMS" ] 66 defines += [ "ENABLE_BROWSER_CDMS" ]
67 } 67 }
68 if (enable_plugins) { 68 if (enable_plugins) {
69 defines += [ "ENABLE_PLUGINS=1" ] 69 defines += [ "ENABLE_PLUGINS=1" ]
70 } 70 }
71 if (enable_pdf) {
72 defines += [ "ENABLE_PDF=1" ]
73 }
71 if (enable_basic_printing || enable_print_preview) { 74 if (enable_basic_printing || enable_print_preview) {
72 # Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW. 75 # Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW.
73 defines += [ "ENABLE_PRINTING=1" ] 76 defines += [ "ENABLE_PRINTING=1" ]
74 if (enable_basic_printing) { 77 if (enable_basic_printing) {
75 # Enable basic printing support and UI. 78 # Enable basic printing support and UI.
76 defines += [ "ENABLE_BASIC_PRINTING=1" ] 79 defines += [ "ENABLE_BASIC_PRINTING=1" ]
77 } 80 }
78 if (enable_print_preview) { 81 if (enable_print_preview) {
79 # Enable printing with print preview. 82 # Enable printing with print preview.
80 # Can be defined without ENABLE_BASIC_PRINTING. 83 # Can be defined without ENABLE_BASIC_PRINTING.
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 # with precompiled headers since the source file that's "compiled" for 444 # with precompiled headers since the source file that's "compiled" for
442 # making the precompiled header is empty. 445 # making the precompiled header is empty.
443 # 446 #
444 # This error doesn't happen every time. In VS2013, it seems if the .pch 447 # This error doesn't happen every time. In VS2013, it seems if the .pch
445 # file doesn't exist, no error will be generated (probably MS tested this 448 # file doesn't exist, no error will be generated (probably MS tested this
446 # case but forgot the other one?). To reproduce this error, do a build, 449 # case but forgot the other one?). To reproduce this error, do a build,
447 # then delete the precompile.c.obj file, then build again. 450 # then delete the precompile.c.obj file, then build again.
448 cflags_c = [ "/wd4206" ] 451 cflags_c = [ "/wd4206" ]
449 } 452 }
450 } 453 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698