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

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

Issue 375483003: Change Android toolchain to GCC 4.9. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn fix (bis) Created 6 years, 3 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 unified diff | Download patch
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 declare_args() { 8 declare_args() {
9 # Absolute directory containing the Android source code. 9 # Absolute directory containing the Android source code.
10 android_src = "" 10 android_src = ""
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 # Subdirectories inside android_ndk_root that contain the sysroot for the 72 # Subdirectories inside android_ndk_root that contain the sysroot for the
73 # associated platform. 73 # associated platform.
74 _android_api_level = 14 74 _android_api_level = 14
75 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 " 75 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 "
76 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm " 76 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm "
77 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps" 77 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps"
78 78
79 # Toolchain root directory for each build. The actual binaries are inside 79 # Toolchain root directory for each build. The actual binaries are inside
80 # a "bin" directory inside of these. 80 # a "bin" directory inside of these.
81 _android_toolchain_version = "4.8" 81 _android_toolchain_version = "4.9"
82 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}" 82 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}"
83 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 83 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
84 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 84 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
85 85
86 # Location of libgcc. This is only needed for the current GN toolchain, so we 86 # Location of libgcc. This is only needed for the current GN toolchain, so we
87 # only need to define the current one, rather than one for every platform 87 # only need to define the current one, rather than one for every platform
88 # like the toolchain roots. 88 # like the toolchain roots.
89 if (cpu_arch == "x86") { 89 if (cpu_arch == "x86") {
90 android_prebuilt_arch = "android-x86" 90 android_prebuilt_arch = "android-x86"
91 _binary_prefix = "i686-linux-android" 91 _binary_prefix = "i686-linux-android"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 android_app_abi = "mips" 138 android_app_abi = "mips"
139 } else { 139 } else {
140 assert(false, "Unknown Android ABI: " + cpu_arch) 140 assert(false, "Unknown Android ABI: " + cpu_arch)
141 } 141 }
142 } else { 142 } else {
143 if (!defined(is_android_webview_build)) { 143 if (!defined(is_android_webview_build)) {
144 is_android_webview_build = false 144 is_android_webview_build = false
145 } 145 }
146 use_system_stlport = false 146 use_system_stlport = false
147 } 147 }
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698