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

Unified Diff: build/config/sysroot.gni

Issue 2645523003: Build ozone/linux_os with jessie sysroot when use_ozone=true (Closed)
Patch Set: Created 3 years, 11 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
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"
« no previous file with comments | « no previous file | build/linux/sysroot_scripts/install-sysroot.py » ('j') | build/linux/sysroot_scripts/install-sysroot.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698