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

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

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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/config/allocator.gni ('k') | build/config/android/internal_rules.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 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 android_sdk_build_tools = 84 android_sdk_build_tools =
85 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" 85 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
86 86
87 # Path to the SDK's android.jar 87 # Path to the SDK's android.jar
88 android_sdk_jar = "$android_sdk/android.jar" 88 android_sdk_jar = "$android_sdk/android.jar"
89 89
90 zipalign_path = "$android_sdk_build_tools/zipalign" 90 zipalign_path = "$android_sdk_build_tools/zipalign"
91 91
92 # Subdirectories inside android_ndk_root that contain the sysroot for the 92 # Subdirectories inside android_ndk_root that contain the sysroot for the
93 # associated platform. 93 # associated platform.
94 _android_api_level = 14 94 _android_api_level = 16
95 x86_android_sysroot_subdir = 95 x86_android_sysroot_subdir =
96 "platforms/android-${_android_api_level}/arch-x86" 96 "platforms/android-${_android_api_level}/arch-x86"
97 arm_android_sysroot_subdir = 97 arm_android_sysroot_subdir =
98 "platforms/android-${_android_api_level}/arch-arm" 98 "platforms/android-${_android_api_level}/arch-arm"
99 mips_android_sysroot_subdir = 99 mips_android_sysroot_subdir =
100 "platforms/android-${_android_api_level}/arch-mips" 100 "platforms/android-${_android_api_level}/arch-mips"
101 _android64_api_level = 21 101 _android64_api_level = 21
102 x86_64_android_sysroot_subdir = 102 x86_64_android_sysroot_subdir =
103 "platforms/android-${_android64_api_level}/arch-x86_64" 103 "platforms/android-${_android64_api_level}/arch-x86_64"
104 arm64_android_sysroot_subdir = 104 arm64_android_sysroot_subdir =
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 } else if (current_cpu == "x64") { 183 } else if (current_cpu == "x64") {
184 android_app_abi = "x86_64" 184 android_app_abi = "x86_64"
185 } else if (current_cpu == "arm64") { 185 } else if (current_cpu == "arm64") {
186 android_app_abi = "arm64-v8a" 186 android_app_abi = "arm64-v8a"
187 } else if (current_cpu == "mips64el") { 187 } else if (current_cpu == "mips64el") {
188 android_app_abi = "mips64" 188 android_app_abi = "mips64"
189 } else { 189 } else {
190 assert(false, "Unknown Android ABI: " + current_cpu) 190 assert(false, "Unknown Android ABI: " + current_cpu)
191 } 191 }
192 } 192 }
OLDNEW
« no previous file with comments | « build/config/allocator.gni ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698