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

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

Issue 383613002: Make android_apk template actually create an apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-apk-dex
Patch Set: Created 6 years, 4 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/android/gyp/package_resources.py ('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 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 = "20" 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
20 android_default_keystore_path = "//build/android/ant/chromium-debug.keystore "
21 android_default_keystore_name = "chromiumdebugkey"
22 android_default_keystore_password = "chromium"
19 } 23 }
20 24
21 if (is_android_webview_build) { 25 if (is_android_webview_build) {
22 assert(android_src != "", 26 assert(android_src != "",
23 "You must specify android_src for an Android WebView build.") 27 "You must specify android_src for an Android WebView build.")
24 } 28 }
25 29
30
26 # Host stuff ----------------------------------------------------------------- 31 # Host stuff -----------------------------------------------------------------
27 32
28 # Defines the name the Android build gives to the current host CPU 33 # Defines the name the Android build gives to the current host CPU
29 # architecture, which is different than the names GN uses. 34 # architecture, which is different than the names GN uses.
30 if (build_cpu_arch == "x64") { 35 if (build_cpu_arch == "x64") {
31 android_host_arch = "x86_64" 36 android_host_arch = "x86_64"
32 } else if (build_cpu_arch == "x86") { 37 } else if (build_cpu_arch == "x86") {
33 android_host_arch = "x86" 38 android_host_arch = "x86"
34 } else { 39 } else {
35 assert(false, "Need Android toolchain support for your build CPU arch.") 40 assert(false, "Need Android toolchain support for your build CPU arch.")
(...skipping 19 matching lines...) Expand all
55 android_ndk_root = "//third_party/android_tools/ndk" 60 android_ndk_root = "//third_party/android_tools/ndk"
56 61
57 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" 62 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
58 63
59 android_sdk_tools = "${android_sdk_root}/tools" 64 android_sdk_tools = "${android_sdk_root}/tools"
60 android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0" 65 android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0"
61 66
62 # Path to the SDK's android.jar 67 # Path to the SDK's android.jar
63 android_sdk_jar = "$android_sdk/android.jar" 68 android_sdk_jar = "$android_sdk/android.jar"
64 69
70 zipalign_path = "$android_sdk_build_tools/zipalign"
71
65 # Subdirectories inside android_ndk_root that contain the sysroot for the 72 # Subdirectories inside android_ndk_root that contain the sysroot for the
66 # associated platform. 73 # associated platform.
67 _android_api_level = 14 74 _android_api_level = 14
68 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 " 75 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 "
69 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm " 76 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm "
70 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps" 77 mips_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-mi ps"
71 78
72 # Toolchain root directory for each build. The actual binaries are inside 79 # Toolchain root directory for each build. The actual binaries are inside
73 # a "bin" directory inside of these. 80 # a "bin" directory inside of these.
74 _android_toolchain_version = "4.8" 81 _android_toolchain_version = "4.8"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 android_app_abi = "mips" 126 android_app_abi = "mips"
120 } else { 127 } else {
121 assert(false, "Unknown Android ABI: " + cpu_arch) 128 assert(false, "Unknown Android ABI: " + cpu_arch)
122 } 129 }
123 } else { 130 } else {
124 if (!defined(is_android_webview_build)) { 131 if (!defined(is_android_webview_build)) {
125 is_android_webview_build = false 132 is_android_webview_build = false
126 } 133 }
127 use_system_stlport = false 134 use_system_stlport = false
128 } 135 }
OLDNEW
« no previous file with comments | « build/android/gyp/package_resources.py ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698