build/android/ant/apk-codegen.xml - Issue 21977003: Build changes for updating Android SDK to 4.3.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/ant/apk-codegen.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:

Index: build/android/ant/apk-codegen.xml

diff --git a/build/android/ant/apk-codegen.xml b/build/android/ant/apk-codegen.xml

index e60d6ca163cbd89aa932fd2941d034a6263b325b..37abb077f1958e760d72d4d56757132992c1c7c2 100644

--- a/build/android/ant/apk-codegen.xml

+++ b/build/android/ant/apk-codegen.xml

@@ -26,15 +26,13 @@

- <property name="target" value="android-${ANDROID_SDK_VERSION}"/>

- <property name="android.tools.dir" location="${sdk.dir}/tools" />

- <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tools" />

- <property name="aapt" location="${android.platform.tools.dir}/aapt" />

+ <property name="android.sdk.tools.dir" location="${ANDROID_SDK_TOOLS}" />

+ <property name="aapt" location="${android.sdk.tools.dir}/aapt" />

- <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />

+ <pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />

</path>

« no previous file with comments | « DEPS ('k') | build/android/ant/apk-compile.xml » ('j') | no next file with comments »