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

Side by Side Diff: build/config/android/config.gni

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 | « no previous file | build/toolchain/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This file contains common system config stuff for the Android build. 5 # This file contains common system config stuff for the Android build.
6 6
7 if (is_android) { 7 if (is_android) {
8 assert(rebase_path("//", root_build_dir) == "../../", 8 assert(rebase_path("//", root_build_dir) == "../../",
9 "Android output directory must be nested 2 levels within src/ (" + 9 "Android output directory must be nested 2 levels within src/ (" +
10 "e.g.: out-gn/Debug). http://crbug.com/412935") 10 "e.g.: out-gn/Debug). http://crbug.com/412935")
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 mips64_android_sysroot_subdir = 170 mips64_android_sysroot_subdir =
171 "platforms/android-${_android64_api_level}/arch-mips64" 171 "platforms/android-${_android64_api_level}/arch-mips64"
172 172
173 # Toolchain root directory for each build. The actual binaries are inside 173 # Toolchain root directory for each build. The actual binaries are inside
174 # a "bin" directory inside of these. 174 # a "bin" directory inside of these.
175 _android_toolchain_version = "4.9" 175 _android_toolchain_version = "4.9"
176 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}" 176 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}"
177 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 177 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
178 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 178 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
179 x86_64_android_toolchain_root = "$android_ndk_root/toolchains/x86_64-${_androi d_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" 179 x86_64_android_toolchain_root = "$android_ndk_root/toolchains/x86_64-${_androi d_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
180 arm64_android_toolchain_root = "$android_ndk_root/toolchains/aarch64-${_androi d_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" 180 arm64_android_toolchain_root = "$android_ndk_root/toolchains/aarch64-linux-and roid-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_ar ch}"
181 mips64_android_toolchain_root = "$android_ndk_root/toolchains/mips64el-${_andr oid_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" 181 mips64_android_toolchain_root = "$android_ndk_root/toolchains/mips64el-linux-a ndroid-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_ arch}"
182 182
183 # Location of libgcc. This is only needed for the current GN toolchain, so we 183 # Location of libgcc. This is only needed for the current GN toolchain, so we
184 # only need to define the current one, rather than one for every platform 184 # only need to define the current one, rather than one for every platform
185 # like the toolchain roots. 185 # like the toolchain roots.
186 if (current_cpu == "x86") { 186 if (current_cpu == "x86") {
187 android_prebuilt_arch = "android-x86" 187 android_prebuilt_arch = "android-x86"
188 _binary_prefix = "i686-linux-android" 188 _binary_prefix = "i686-linux-android"
189 android_toolchain_root = "$x86_android_toolchain_root" 189 android_toolchain_root = "$x86_android_toolchain_root"
190 android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${ _android_toolchain_version}/libgcc.a" 190 android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${ _android_toolchain_version}/libgcc.a"
191 } else if (current_cpu == "arm") { 191 } else if (current_cpu == "arm") {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 } else if (current_cpu == "x64") { 243 } else if (current_cpu == "x64") {
244 android_app_abi = "x86_64" 244 android_app_abi = "x86_64"
245 } else if (current_cpu == "arm64") { 245 } else if (current_cpu == "arm64") {
246 android_app_abi = "arm64-v8a" 246 android_app_abi = "arm64-v8a"
247 } else if (current_cpu == "mips64el") { 247 } else if (current_cpu == "mips64el") {
248 android_app_abi = "mips64" 248 android_app_abi = "mips64"
249 } else { 249 } else {
250 assert(false, "Unknown Android ABI: " + current_cpu) 250 assert(false, "Unknown Android ABI: " + current_cpu)
251 } 251 }
252 } 252 }
OLDNEW
« no previous file with comments | « no previous file | build/toolchain/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698