build/toolchain/android/BUILD.gn - Issue 1517213002: GN: Fix incorrect android toolchain value for arm64 and mips64el

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: build/toolchain/android/BUILD.gn

Issue 1517213002: GN: Fix incorrect android toolchain value for arm64 and mips64el (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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 unified diff | Download patch

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

OLD	NEW
1 # Copyright 2013 The Chromium Authors. All rights reserved.	1 # Copyright 2013 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import("//build/config/sysroot.gni") # Imports android/config.gni.	5 import("//build/config/sysroot.gni") # Imports android/config.gni.

6 import("//build/toolchain/gcc_toolchain.gni")	6 import("//build/toolchain/gcc_toolchain.gni")

7	7

8 # The Android GCC toolchains share most of the same parameters, so we have this	8 # The Android GCC toolchains share most of the same parameters, so we have this

9 # wrapper around gcc_toolchain to avoid duplication of logic.	9 # wrapper around gcc_toolchain to avoid duplication of logic.

10 #	10 #

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 android_ndk_lib_dir = "usr/lib64"	104 android_ndk_lib_dir = "usr/lib64"

105	105

106 tool_prefix = "$x86_64_android_toolchain_root/bin/x86_64-linux-android-"	106 tool_prefix = "$x86_64_android_toolchain_root/bin/x86_64-linux-android-"

107 toolchain_cpu = "x86_64"	107 toolchain_cpu = "x86_64"

108 }	108 }

109	109

110 android_gcc_toolchains_helper("arm64") {	110 android_gcc_toolchains_helper("arm64") {

111 android_ndk_sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir"	111 android_ndk_sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir"

112 android_ndk_lib_dir = "usr/lib"	112 android_ndk_lib_dir = "usr/lib"

113	113

114 tool_prefix = "$arm64_android_toolchain_root/bin/arm-linux-androideabi-"	114 tool_prefix = "$arm64_android_toolchain_root/bin/aarch64-linux-android-"

115 toolchain_cpu = "aarch64"	115 toolchain_cpu = "aarch64"

116 }	116 }

117	117

118 android_gcc_toolchains_helper("mips64el") {	118 android_gcc_toolchains_helper("mips64el") {

119 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"	119 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"

120 android_ndk_lib_dir = "usr/lib64"	120 android_ndk_lib_dir = "usr/lib64"

121	121

122 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"	122 tool_prefix = "$mips64_android_toolchain_root/bin/mips64el-linux-android-"

123 toolchain_cpu = "mipsel64el"	123 toolchain_cpu = "mipsel64el"

124 }	124 }

OLD	NEW