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

Unified Diff: printing/BUILD.gn

Issue 1671203002: Fix gn gen on //printing when use_sysroot = false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/BUILD.gn
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index 466388fd4ceee7b0364679429735f27af2bac30c..ce6c9d4ae0182fe2980421b6eb775fe1a5f2047a 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -128,10 +128,16 @@ component("printing") {
configs += [ ":cups" ]
if (is_linux) {
+ # rebase_path does not accept an empty string
+ if (use_sysroot) {
+ cups_sysroot = rebase_path(sysroot)
+ } else {
+ cups_sysroot = ""
+ }
cups_version = exec_script("cups_config_helper.py",
[
"--api-version",
- rebase_path(sysroot),
+ cups_sysroot,
],
"trim string")
@@ -241,10 +247,16 @@ if (use_cups) {
libs = [ "cups" ]
lib_dirs = [ "$mac_sdk_path/usr/lib" ]
} else {
+ # rebase_path does not accept an empty string
+ if (use_sysroot) {
+ cups_sysroot = rebase_path(sysroot)
+ } else {
+ cups_sysroot = ""
+ }
libs = exec_script("cups_config_helper.py",
[
"--libs-for-gn",
- rebase_path(sysroot),
+ cups_sysroot,
],
"value")
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698