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

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

Issue 2854583002: [infra] Roll clang to match the version used by Flutter (Closed)
Patch Set: Fixes for Windows Created 3 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
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 if (!defined(default_android_sdk_root)) { 8 if (!defined(default_android_sdk_root)) {
9 default_android_sdk_root = "//third_party/android_tools/sdk" 9 default_android_sdk_root = "//third_party/android_tools/sdk"
10 default_android_sdk_version = "22" 10 default_android_sdk_version = "22"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 android_sdk_build_tools = 55 android_sdk_build_tools =
56 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" 56 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
57 57
58 # Path to the SDK's android.jar 58 # Path to the SDK's android.jar
59 android_sdk_jar = "$android_sdk/android.jar" 59 android_sdk_jar = "$android_sdk/android.jar"
60 60
61 zipalign_path = "$android_sdk_build_tools/zipalign" 61 zipalign_path = "$android_sdk_build_tools/zipalign"
62 62
63 # Subdirectories inside android_ndk_root that contain the sysroot for the 63 # Subdirectories inside android_ndk_root that contain the sysroot for the
64 # associated platform. 64 # associated platform.
65 _android_api_level = 16 65 if (current_cpu == "x64" || current_cpu == "arm64") {
66 _android_api_level = 22
67 } else {
68 _android_api_level = 16
69 }
66 x86_android_sysroot_subdir = 70 x86_android_sysroot_subdir =
67 "platforms/android-${_android_api_level}/arch-x86" 71 "platforms/android-${_android_api_level}/arch-x86"
68 arm_android_sysroot_subdir = 72 arm_android_sysroot_subdir =
69 "platforms/android-${_android_api_level}/arch-arm" 73 "platforms/android-${_android_api_level}/arch-arm"
70 mips_android_sysroot_subdir = 74 mips_android_sysroot_subdir =
71 "platforms/android-${_android_api_level}/arch-mips" 75 "platforms/android-${_android_api_level}/arch-mips"
72 _android64_api_level = 21 76 _android64_api_level = 21
73 x86_64_android_sysroot_subdir = 77 x86_64_android_sysroot_subdir =
74 "platforms/android-${_android64_api_level}/arch-x86_64" 78 "platforms/android-${_android64_api_level}/arch-x86_64"
75 arm64_android_sysroot_subdir = 79 arm64_android_sysroot_subdir =
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } else if (current_cpu == "x64") { 167 } else if (current_cpu == "x64") {
164 android_app_abi = "x86_64" 168 android_app_abi = "x86_64"
165 } else if (current_cpu == "arm64") { 169 } else if (current_cpu == "arm64") {
166 android_app_abi = "arm64-v8a" 170 android_app_abi = "arm64-v8a"
167 } else if (current_cpu == "mips64el") { 171 } else if (current_cpu == "mips64el") {
168 android_app_abi = "mips64" 172 android_app_abi = "mips64"
169 } else { 173 } else {
170 assert(false, "Unknown Android ABI: " + current_cpu) 174 assert(false, "Unknown Android ABI: " + current_cpu)
171 } 175 }
172 176
173 android_log_tag = "\"flutter\"" 177 android_log_tag = "\"dart\""
174 } 178 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698