build/config/sysroot.gni - Issue 1285243004: Rename & rework is_chromeos

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/config/sysroot.gni

Issue 1285243004: Rename & rework is_chromeos (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master

Patch Set: Created 5 years, 4 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:

Index: build/config/sysroot.gni

diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni

index 1c86210fda14ff6d50066ab65ef7d9782d7182da..815cdc4d98cdb1b50ecf901179e28f0b1ef2aa15 100644

--- a/build/config/sysroot.gni

+++ b/build/config/sysroot.gni

@@ -19,7 +19,7 @@ if (is_android) {

} else {

sysroot = ""

}

-} else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {

Peter Mayo 2015/08/13 02:40:43 is_desktop_linux looks better here.

+} else if (is_linux && !is_chromeos && 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") {

@@ -31,7 +31,7 @@ if (is_android) {

# Any other builds don't use a sysroot.

sysroot = ""

}

-} else if (is_linux && !is_chromeos) {

+} else if (is_desktop_linux) {

if (current_cpu == "mipsel") {

sysroot = rebase_path("//mipsel-sysroot/sysroot")

} else {

« no previous file with comments | « build/config/features.gni ('k') | build/config/ui.gni » ('j') | no next file with comments »