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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index abb737b6062404a82d87b6e59322babb4b430d82..522318e618c19f4912726d608c8254b53b9e0d0e 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -54,8 +54,13 @@ if (is_android) {
# Path to the Android NDK and SDK.
android_ndk_root = "//third_party/android_tools/ndk"
+ android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
+
+ android_sdk_tools = "${android_sdk_root}/tools"
+ android_sdk_build_tools = "${android_sdk_root}/build-tools/19.0.0"
+
# Path to the SDK's android.jar
- android_sdk_jar = "$android_sdk_root/platforms/android-19/android.jar"
+ android_sdk_jar = "$android_sdk/android.jar"
# Subdirectories inside android_ndk_root that contain the sysroot for the
# associated platform.
« 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