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

Unified Diff: build/config/sysroot.gni

Issue 2687203002: Add a build arg to control whether to use a jessie sysroot. (Closed)
Patch Set: Created 3 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 | tools/mb/mb_config.pyl » ('j') | 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 f2118103c7f9a083171f9756fab0e35282987356..2bcd6caae1e9a468e7b39f3613c41d2eac5b6ea9 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -16,6 +16,10 @@ declare_args() {
target_sysroot_dir = ""
use_sysroot = true
+
+ # TODO(tonikitoo): Remove this arg when wheezy is finally dropped and we
+ # can just use debian/jessie everywhere by default. crbug.com/564904.
+ use_jessie_sysroot = false
}
if (is_linux && target_sysroot_dir != "") {
@@ -58,15 +62,8 @@ if (is_linux && target_sysroot_dir != "") {
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")
- import("//ui/base/ui_features.gni")
- if (use_ozone && use_xkbcommon) {
- sysroot = "//build/linux/debian_jessie_amd64-sysroot"
- }
+ if (use_jessie_sysroot) {
+ sysroot = "//build/linux/debian_jessie_amd64-sysroot"
}
} else if (current_cpu == "x86") {
sysroot = "//build/linux/debian_wheezy_i386-sysroot"
« no previous file with comments | « no previous file | tools/mb/mb_config.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698