diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 22:19:59 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 22:19:59 +0000 |
| commit | 0eb35fce7fee6d75f4f259edeb87cf756f1f512a (patch) | |
| tree | 5ceb98155e11388dc1b445f22b24dfe9b414cd41 /build | |
| parent | 84e5eb10fc96974f50d638c6ffc670718915ff4f (diff) | |
| download | chromium_src-0eb35fce7fee6d75f4f259edeb87cf756f1f512a.zip chromium_src-0eb35fce7fee6d75f4f259edeb87cf756f1f512a.tar.gz chromium_src-0eb35fce7fee6d75f4f259edeb87cf756f1f512a.tar.bz2 | |
Revert 284508 "GN chrome/common build, rename enable_printing."
> GN chrome/common build, rename enable_printing.
>
> This adds the missing conditions to the chrome/common GN build file (previously
> only the basic files were there). Some refactoring of the GYP file to make this
> possible.
>
> Renames the enable_printing flag to printing_mode since this is an integer
> tri-state.
>
> Minor improvements to chrome/renderer
>
> R=jamesr@chromium.org
>
> Review URL: https://codereview.chromium.org/400243003
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/409543008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/BUILD.gn | 4 | ||||
| -rw-r--r-- | build/config/features.gni | 4 | ||||
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index 1203c08..962fa45 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -52,9 +52,9 @@ config("feature_flags") { if (enable_plugins) { defines += [ "ENABLE_PLUGINS=1" ] } - if (printing_mode > 0) { + if (enable_printing > 0) { defines += [ "ENABLE_PRINTING=1" ] - if (printing_mode < 2) { + if (enable_printing < 2) { defines += [ "ENABLE_FULL_PRINTING=1" ] } } diff --git a/build/config/features.gni b/build/config/features.gni index a78d30f..f5d2c59 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -56,9 +56,9 @@ enable_pepper_cdms = enable_plugins && (is_linux || is_mac || is_win) # fully, and 2 enables only the codepath to generate a Metafile (e.g. usually # a PDF or EMF) and disables print preview, cloud print, UI, etc. if (is_android) { - printing_mode = 2 + enable_printing = 2 } else { - printing_mode = 1 + enable_printing = 1 } # The seccomp-bpf sandbox is only supported on three architectures diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index 0fc7373..86a155a 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -121,9 +121,9 @@ if (enable_extensions) { if (enable_plugins) { grit_defines += [ "-D", "enable_plugins" ] } -if (printing_mode != 0) { +if (enable_printing != 0) { grit_defines += [ "-D", "enable_printing" ] - if (printing_mode == 1) { + if (enable_printing == 1) { grit_defines += [ "-D", "enable_full_printing" ] } } |