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

Unified Diff: build/android/ant/apk-package-resources.xml

Issue 21977003: Build changes for updating Android SDK to 4.3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Turns out we need ANDROID_SDK_VERSION in constants.py (findbugs uses it). Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/ant/apk-package.xml ('k') | build/android/dex_action.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ant/apk-package-resources.xml
diff --git a/build/android/ant/apk-package-resources.xml b/build/android/ant/apk-package-resources.xml
index c29dff767fce6e591cef128e3ef5d76ae74a2a1e..3bfd3c9d30319bbefeec3453f34dc6aa7cdf1f05 100644
--- a/build/android/ant/apk-package-resources.xml
+++ b/build/android/ant/apk-package-resources.xml
@@ -24,12 +24,11 @@
<!-- tools location -->
<property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
<property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
- <property name="android.tools.dir" location="${sdk.dir}/tools" />
- <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tools" />
+ <property name="android.sdk.tools.dir" location="${ANDROID_SDK_TOOLS}" />
<!-- jar file from where the tasks are loaded -->
<path id="android.antlibs">
- <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
</path>
<!-- Custom tasks -->
@@ -48,7 +47,7 @@
<property name="asset.dir" value="${ASSET_DIR}" />
<property name="asset.absolute.dir" location="${asset.dir}" />
- <property name="aapt" location="${android.platform.tools.dir}/aapt" />
+ <property name="aapt" location="${android.sdk.tools.dir}/aapt" />
<property name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/>
<property name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/>
« no previous file with comments | « build/android/ant/apk-package.xml ('k') | build/android/dex_action.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698