build/config/sysroot.gni - Issue 864173006: Add GN build support for Android 64-bit platforms.

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 864173006: Add GN build support for Android 64-bit platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove mojo string in log Created 5 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:

Index: build/config/sysroot.gni

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

index 77032f7d4fa3aec5117c77d6685336ff483223b0..a9b250c701a21b77bdb1ffa95caa5fc35394a4cf 100644

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

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

@@ -22,6 +22,12 @@ if (current_toolchain == default_toolchain && target_sysroot != "") {

sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir")

} else if (cpu_arch == "mipsel") {

sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir")

+ } else if (cpu_arch == "x64") {

+ sysroot = rebase_path("$android_ndk_root/$x86_64_android_sysroot_subdir")

+ } else if (cpu_arch == "arm64") {

+ sysroot = rebase_path("$android_ndk_root/$arm64_android_sysroot_subdir")

+ } else if (cpu_arch == "mips64") {

+ sysroot = rebase_path("$android_ndk_root/$mips64_android_sysroot_subdir")

} else {

sysroot = ""

}

« no previous file with comments | « build/config/android/config.gni ('k') | build/toolchain/android/BUILD.gn » ('j') | no next file with comments »