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

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: Remove workaround for MIPS Created 6 years, 5 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 # Subdirectories inside android_ndk_root that contain the sysroot for the 65 # Subdirectories inside android_ndk_root that contain the sysroot for the
66 # associated platform. 66 # associated platform.
67 _android_api_level = 14 67 _android_api_level = 14
68 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 " 68 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 "
69 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm " 69 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm "
70 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps" 70 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps"
71 71
72 # Toolchain root directory for each build. The actual binaries are inside 72 # Toolchain root directory for each build. The actual binaries are inside
73 # a "bin" directory inside of these. 73 # a "bin" directory inside of these.
74 _android_toolchain_version = "4.8" 74 _android_toolchain_version = "4.9"
75 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}" 75 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}"
76 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 76 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
77 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 77 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
78 78
79 # Location of libgcc. This is only needed for the current GN toolchain, so we 79 # Location of libgcc. This is only needed for the current GN toolchain, so we
80 # only need to define the current one, rather than one for every platform 80 # only need to define the current one, rather than one for every platform
81 # like the toolchain roots. 81 # like the toolchain roots.
82 if (cpu_arch == "x86") { 82 if (cpu_arch == "x86") {
83 android_libgcc_file = 83 android_libgcc_file =
84 "$x86_android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolcha in_version}/libgcc.a" 84 "$x86_android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolcha in_version}/libgcc.a"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 android_app_abi = "mips" 119 android_app_abi = "mips"
120 } else { 120 } else {
121 assert(false, "Unknown Android ABI: " + cpu_arch) 121 assert(false, "Unknown Android ABI: " + cpu_arch)
122 } 122 }
123 } else { 123 } else {
124 if (!defined(is_android_webview_build)) { 124 if (!defined(is_android_webview_build)) {
125 is_android_webview_build = false 125 is_android_webview_build = false
126 } 126 }
127 use_system_stlport = false 127 use_system_stlport = false
128 } 128 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698