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

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

Issue 394593002: Roll Android SDK to v20 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update gyp constant 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
« no previous file with comments | « build/common.gypi ('k') | no next file » | 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 = ""
11 11
12 android_sdk_root = "//third_party/android_tools/sdk" 12 android_sdk_root = "//third_party/android_tools/sdk"
13 android_sdk_version = "19" 13 android_sdk_version = "20"
14 14
15 # This is set when building the Android WebView inside the Android build 15 # This is set when building the Android WebView inside the Android build
16 # system, using the 'android' gyp backend. The WebView code is still built 16 # system, using the 'android' gyp backend. The WebView code is still built
17 # when this is unset, but builds using the normal chromium build system. 17 # when this is unset, but builds using the normal chromium build system.
18 is_android_webview_build = false 18 is_android_webview_build = false
19 } 19 }
20 20
21 if (is_android_webview_build) { 21 if (is_android_webview_build) {
22 assert(android_src != "", 22 assert(android_src != "",
23 "You must specify android_src for an Android WebView build.") 23 "You must specify android_src for an Android WebView build.")
(...skipping 26 matching lines...) Expand all
50 # file to define toolchains for all possible targets in one pass. 50 # file to define toolchains for all possible targets in one pass.
51 51
52 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" 52 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
53 53
54 # Path to the Android NDK and SDK. 54 # Path to the Android NDK and SDK.
55 android_ndk_root = "//third_party/android_tools/ndk" 55 android_ndk_root = "//third_party/android_tools/ndk"
56 56
57 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" 57 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
58 58
59 android_sdk_tools = "${android_sdk_root}/tools" 59 android_sdk_tools = "${android_sdk_root}/tools"
60 android_sdk_build_tools = "${android_sdk_root}/build-tools/19.0.0" 60 android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0"
61 61
62 # Path to the SDK's android.jar 62 # Path to the SDK's android.jar
63 android_sdk_jar = "$android_sdk/android.jar" 63 android_sdk_jar = "$android_sdk/android.jar"
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"
(...skipping 48 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
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698