Index: build/config/sysroot.gni |
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni |
index 7fed8b3ee238a807611c9580fd51d53e7600bd06..e2d1bc1ffd0e980dbe075f0d49dc04dd0b0c7762 100644 |
--- a/build/config/sysroot.gni |
+++ b/build/config/sysroot.gni |
@@ -48,12 +48,17 @@ if (is_linux && target_sysroot_dir != "") { |
# By default build against a sysroot image downloaded from Cloud Storage |
# during gclient runhooks. |
if (is_chromeos) { |
- # Regular ChromeOS builds use custom sysroots, but desktop ChromeOS (where |
- # we're building linux desktop binaries but using the ChromeOS UI and |
- # functionality where possible) needs to run on the buliders, which are |
- # running precise. The precise build has a different set of dependencies |
- # from the wheezy build, so we cannot use the wheezy sysroot. |
- sysroot = "//build/linux/ubuntu_precise_amd64-sysroot" |
+ import("//ui/ozone/ozone.gni") |
Tom (Use chromium acct)
2017/01/18 19:02:18
Move the added code into the else block (!is_chrom
tonikitoo
2017/01/20 20:26:21
Done.
|
+ if (use_ozone && ozone_platform_wayland) { |
+ sysroot = "//build/linux/debian_jessie_amd64-sysroot" |
+ } else { |
+ # Regular ChromeOS builds use custom sysroots, but desktop ChromeOS (where |
+ # we're building linux desktop binaries but using the ChromeOS UI and |
+ # functionality where possible) needs to run on the buliders, which are |
+ # running precise. The precise build has a different set of dependencies |
+ # from the wheezy build, so we cannot use the wheezy sysroot. |
+ sysroot = "//build/linux/ubuntu_precise_amd64-sysroot" |
+ } |
} else { |
if (current_cpu == "x64") { |
sysroot = "//build/linux/debian_wheezy_amd64-sysroot" |