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

Unified Diff: content/shell/android/javatests/content_shell_test_apk.xml

Issue 10830012: [Android] Add chrome_java target for building Java code in the chromium layer. (Closed) Base URL: http://git.chromium.org/chromium/src.git@reland
Patch Set: fix java build error Created 8 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 | « content/shell/android/java/content_shell_apk.xml ('k') | media/base/android/java/media.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/javatests/content_shell_test_apk.xml
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
index ba8ba490bb8407dcb6aabad32ef35ddb3103c6da..f4ba3f23816855c70364d881099aea40093c74da 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/content/shell/android/javatests/content_shell_test_apk.xml
@@ -10,11 +10,8 @@
Building ContentShellTest.apk
</description>
- <property environment="env"/>
- <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
- <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/>
- <property name="source.dir" location="src"/>
- <property name="target" value="android-${env.ANDROID_SDK_VERSION}"/>
+ <import file="../../../../build/android/ant/common.xml"/>
+ <import file="../../../../build/android/ant/sdk-targets.xml"/>
<property name="target.abi" value="${APP_ABI}"/>
<property name="out.dir" location="${PRODUCT_DIR}/content_shell_test"/>
<property name="resource.absolute.dir" value="../res"/>
@@ -71,6 +68,10 @@
</target>
+ <!-- Classpath for javac -->
+ <path id="javac.custom.classpath">
+ <path refid="out.dex.jar.input.ref"/>
+ </path>
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
« no previous file with comments | « content/shell/android/java/content_shell_apk.xml ('k') | media/base/android/java/media.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698