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

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

Issue 361633002: [Android][gn] Add android resources templates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-java
Patch Set: Fix bad rebase 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/android/gyp/write_ordered_libraries.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 = ""
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # 47 #
48 # We define may of the dirs strings here for each output architecture (rather 48 # We define may of the dirs strings here for each output architecture (rather
49 # than just the current one) since these are needed by the Android toolchain 49 # than just the current one) since these are needed by the Android toolchain
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}"
58
59 android_sdk_tools = "${android_sdk_root}/tools"
60 android_sdk_build_tools = "${android_sdk_root}/build-tools/19.0.0"
61
57 # Path to the SDK's android.jar 62 # Path to the SDK's android.jar
58 android_sdk_jar = "$android_sdk_root/platforms/android-19/android.jar" 63 android_sdk_jar = "$android_sdk/android.jar"
59 64
60 # Subdirectories inside android_ndk_root that contain the sysroot for the 65 # Subdirectories inside android_ndk_root that contain the sysroot for the
61 # associated platform. 66 # associated platform.
62 _android_api_level = 14 67 _android_api_level = 14
63 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 " 68 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86 "
64 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm " 69 arm_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-arm "
65 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"
66 71
67 # Toolchain root directory for each build. The actual binaries are inside 72 # Toolchain root directory for each build. The actual binaries are inside
68 # a "bin" directory inside of these. 73 # a "bin" directory inside of these.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 android_app_abi = "mips" 119 android_app_abi = "mips"
115 } else { 120 } else {
116 assert(false, "Unknown Android ABI: " + cpu_arch) 121 assert(false, "Unknown Android ABI: " + cpu_arch)
117 } 122 }
118 } else { 123 } else {
119 if (!defined(is_android_webview_build)) { 124 if (!defined(is_android_webview_build)) {
120 is_android_webview_build = false 125 is_android_webview_build = false
121 } 126 }
122 use_system_stlport = false 127 use_system_stlport = false
123 } 128 }
OLDNEW
« no previous file with comments | « build/android/gyp/write_ordered_libraries.py ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698