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

Unified Diff: chrome/BUILD.gn

Issue 2576573002: Move enable_pdf to a buildflag header. (Closed)
Patch Set: No Chromecast Created 4 years 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 | « build/config/features.gni ('k') | chrome/app/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 40ba93f0a33b82c850d7a204c3c1e883a20f9190..a4044b8341f201c4ea18cdb061fb7bf3240b1ff5 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -239,13 +239,11 @@ if (!is_android && !is_mac) {
# Needed to use the master_preferences functions
"//chrome/installer/util:with_no_strings",
"//content/public/app:both",
+ "//pdf",
# For headless mode.
"//headless:headless_shell_lib",
]
- if (enable_plugins && enable_pdf) {
- deps += [ "//pdf" ]
- }
public_deps = [
":xdg_mime", # Needs to be public for installer to consume files.
@@ -378,13 +376,10 @@ if (is_win) {
deps += [
":child_dependencies",
"//content/public/app:both",
+ "//pdf",
]
}
- if (enable_plugins && enable_pdf && !is_multi_dll_chrome) {
- deps += [ "//pdf" ]
- }
-
if (enable_package_mash_services) {
deps += [ "//chrome/app/mash" ]
}
@@ -420,6 +415,7 @@ if (is_win) {
"//components/browser_watcher:browser_watcher_client",
"//components/crash/content/app",
"//content/public/app:child",
+ "//pdf",
]
ldflags = [
@@ -439,10 +435,6 @@ if (is_win) {
configs += [ "//build/config/win:no_incremental_linking" ]
}
configs += [ "//build/config/compiler/pgo:default_pgo_flags" ]
-
- if (enable_plugins && enable_pdf) {
- deps += [ "//pdf" ]
- }
}
}
copy("copy_first_run") {
@@ -980,6 +972,7 @@ if (is_win) {
"//components/crash/content/app",
"//components/policy:generated",
"//content/public/app:both",
+ "//pdf",
"//third_party/cld",
]
@@ -993,10 +986,6 @@ if (is_win) {
"-ObjC",
]
- if (enable_plugins && enable_pdf) {
- deps += [ "//pdf" ]
- }
-
if (enable_package_mash_services) {
deps += [ "//chrome/app/mash" ]
}
« no previous file with comments | « build/config/features.gni ('k') | chrome/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698