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

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

Issue 218633007: Changed android toolchain to use GCC 4.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Extra blank line Created 6 years, 7 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
« no previous file with comments | « build/common.gypi ('k') | build/config/arm.gni » ('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 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 # Subdirectories inside android_ndk_root that contain the sysroot for the 52 # Subdirectories inside android_ndk_root that contain the sysroot for the
53 # associated platform. 53 # associated platform.
54 _android_api_level = 14 54 _android_api_level = 14
55 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 " 55 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 "
56 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm " 56 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm "
57 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps" 57 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps"
58 58
59 # Toolchain root directory for each build. The actual binaries are inside 59 # Toolchain root directory for each build. The actual binaries are inside
60 # a "bin" directory inside of these. 60 # a "bin" directory inside of these.
61 _android_toolchain_version = "4.6" 61 _android_toolchain_version = "4.8"
62 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}" 62 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}"
63 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 63 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
64 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 64 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
65 65
66 # Location of libgcc. This is only needed for the current GN toolchain, so we 66 # Location of libgcc. This is only needed for the current GN toolchain, so we
67 # only need to define the current one, rather than one for every platform 67 # only need to define the current one, rather than one for every platform
68 # like the toolchain roots. 68 # like the toolchain roots.
69 if (cpu_arch == "x86") { 69 if (cpu_arch == "x86") {
70 android_libgcc_file = 70 android_libgcc_file =
71 "$x86_android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolcha in_version}/libgcc.a" 71 "$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
106 android_app_abi = "mips" 106 android_app_abi = "mips"
107 } else { 107 } else {
108 assert(false, "Unknown Android ABI: " + cpu_arch) 108 assert(false, "Unknown Android ABI: " + cpu_arch)
109 } 109 }
110 } else { 110 } else {
111 if (!defined(is_android_webview_build)) { 111 if (!defined(is_android_webview_build)) {
112 is_android_webview_build = false 112 is_android_webview_build = false
113 } 113 }
114 use_system_stlport = false 114 use_system_stlport = false
115 } 115 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/arm.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698