diff options
| author | agoode <agoode@chromium.org> | 2016-02-07 14:27:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-07 22:28:53 +0000 |
| commit | ed2297175eabde75cb039711658d834777caa53f (patch) | |
| tree | dadcf81a97923351890e06082add0ecba7893c5c /printing | |
| parent | 4ac6fe96e2b4a537440be12bb7e5a960a0b02c34 (diff) | |
| download | chromium_src-ed2297175eabde75cb039711658d834777caa53f.zip chromium_src-ed2297175eabde75cb039711658d834777caa53f.tar.gz chromium_src-ed2297175eabde75cb039711658d834777caa53f.tar.bz2 | |
Fix gn gen on //printing when use_sysroot = false
BUG=580103
Review URL: https://codereview.chromium.org/1671203002
Cr-Commit-Position: refs/heads/master@{#374069}
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/BUILD.gn | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/printing/BUILD.gn b/printing/BUILD.gn index 466388f..ce6c9d4 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") } |