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

Unified Diff: build/config/sysroot.gni

Issue 2645523003: Build ozone/linux_os with jessie sysroot when use_ozone=true (Closed)
Patch Set: excluding chromecast builds 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
« 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: build/config/sysroot.gni
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index 7fed8b3ee238a807611c9580fd51d53e7600bd06..80228e82391488b81e55d400c7550194aac8bc72 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -57,6 +57,16 @@ if (is_linux && target_sysroot_dir != "") {
} else {
if (current_cpu == "x64") {
sysroot = "//build/linux/debian_wheezy_amd64-sysroot"
+
+ # TODO(tonikitoo): Remove the whole if clause below when debian/wheezy
+ # sysroots are switched to debian/jessie, crbug.com/564904.
+ import("//build_overrides/build.gni")
+ if (build_with_chromium) {
+ import("//ui/ozone/ozone.gni")
+ if (use_ozone && !is_chromecast) {
+ sysroot = "//build/linux/debian_jessie_amd64-sysroot"
+ }
+ }
} else if (current_cpu == "x86") {
sysroot = "//build/linux/debian_wheezy_i386-sysroot"
} else if (current_cpu == "mipsel") {
« 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