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

Unified Diff: build/config/sysroot.gni

Issue 1581753002: Remove Chrome OS-related GN build configuration (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Delete build/toolchain/cros Created 4 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 | « build/config/linux/BUILD.gn ('k') | build/sanitizers/BUILD.gn » ('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 2be55c8fa5a5908e6a1bc13c5355d26b3d4dc868..4fcfc4b323e5300342f7a0c34db978149834efeb 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -34,7 +34,7 @@ if (current_toolchain == default_toolchain && target_sysroot != "") {
}
} else if (is_fnl) {
assert(false, "FNL needs target_sysroot")
-} else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {
+} else if (is_linux && is_chrome_branded && is_official_build) {
# For official builds, use the sysroot checked into the internal source repo
# so that the builds work on older versions of Linux.
if (current_cpu == "x64") {
@@ -46,7 +46,7 @@ if (current_toolchain == default_toolchain && target_sysroot != "") {
# Any other builds don't use a sysroot.
sysroot = ""
}
-} else if (is_linux && !is_chromeos) {
+} else if (is_linux) {
if (current_cpu == "mipsel") {
sysroot = rebase_path("//mipsel-sysroot/sysroot")
} else {
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | build/sanitizers/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698