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

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

Issue 2378223002: Roll buildtools forward and fix GN build for it. (Closed)
Patch Set: Created 4 years, 2 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 | « DEPS ('k') | build/config/compiler/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 has_chrome_android_internal = 8 has_chrome_android_internal =
9 exec_script("//build/dir_exists.py", 9 exec_script("//build/dir_exists.py",
10 [ rebase_path("//clank", root_build_dir) ], 10 [ rebase_path("//clank", root_build_dir) ],
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 mips64_android_sysroot_subdir = 107 mips64_android_sysroot_subdir =
108 "platforms/android-${_android64_api_level}/arch-mips64" 108 "platforms/android-${_android64_api_level}/arch-mips64"
109 109
110 # Toolchain root directory for each build. The actual binaries are inside 110 # Toolchain root directory for each build. The actual binaries are inside
111 # a "bin" directory inside of these. 111 # a "bin" directory inside of these.
112 _android_toolchain_version = "4.9" 112 _android_toolchain_version = "4.9"
113 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}" 113 x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_tool chain_version}/prebuilt/${android_host_os}-${android_host_arch}"
114 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 114 arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androidea bi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
115 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }" 115 mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-andro id-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch }"
116 x86_64_android_toolchain_root = "$android_ndk_root/toolchains/x86_64-${_androi d_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" 116 x86_64_android_toolchain_root = "$android_ndk_root/toolchains/x86_64-${_androi d_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
117 arm64_android_toolchain_root = "$android_ndk_root/toolchains/aarch64-${_androi d_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" 117 arm64_android_toolchain_root = "$android_ndk_root/toolchains/aarch64-linux-and roid-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_ar ch}"
118 mips64_android_toolchain_root = "$android_ndk_root/toolchains/mips64el-${_andr oid_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" 118 mips64_android_toolchain_root = "$android_ndk_root/toolchains/mips64el-${_andr oid_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
119 119
120 # Location of libgcc. This is only needed for the current GN toolchain, so we 120 # Location of libgcc. This is only needed for the current GN toolchain, so we
121 # only need to define the current one, rather than one for every platform 121 # only need to define the current one, rather than one for every platform
122 # like the toolchain roots. 122 # like the toolchain roots.
123 if (current_cpu == "x86") { 123 if (current_cpu == "x86") {
124 android_prebuilt_arch = "android-x86" 124 android_prebuilt_arch = "android-x86"
125 _binary_prefix = "i686-linux-android" 125 _binary_prefix = "i686-linux-android"
126 android_toolchain_root = "$x86_android_toolchain_root" 126 android_toolchain_root = "$x86_android_toolchain_root"
127 android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${ _android_toolchain_version}/libgcc.a" 127 android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${ _android_toolchain_version}/libgcc.a"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } else if (current_cpu == "arm64") { 195 } else if (current_cpu == "arm64") {
196 android_app_abi = "arm64-v8a" 196 android_app_abi = "arm64-v8a"
197 } else if (current_cpu == "mips64el") { 197 } else if (current_cpu == "mips64el") {
198 android_app_abi = "mips64" 198 android_app_abi = "mips64"
199 } else { 199 } else {
200 assert(false, "Unknown Android ABI: " + current_cpu) 200 assert(false, "Unknown Android ABI: " + current_cpu)
201 } 201 }
202 202
203 android_log_tag = "\"flutter\"" 203 android_log_tag = "\"flutter\""
204 } 204 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698