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

Unified Diff: content/shell/android/java/content_shell_apk.xml

Issue 10763019: Fix ant build of content shell for updated Android SDK tools. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/java/content_shell_apk.xml
diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/java/content_shell_apk.xml
index 986979a5aaa6d6862a2c437c2e4d1e38892abd00..cbdeaccfeafb5d94e4a1e0cd1293ec6db9608251 100644
--- a/content/shell/android/java/content_shell_apk.xml
+++ b/content/shell/android/java/content_shell_apk.xml
@@ -19,19 +19,19 @@
<property name="out.dir" location="${PRODUCT_DIR}/content_shell"/>
<property name="resource.absolute.dir" value="../res"/>
<property name="gen.absolute.dir" value="${out.dir}/gen"/>
- <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
<path id="native.libs.gdbserver">
<fileset file="${toolchain.dir}/../../gdbserver"/>
</path>
<property name="native.libs.absolute.dir" location="${out.dir}/libs" />
<property name="asset.absolute.dir" location="${out.dir}/assets" />
- <!-- If your app crashes when referencing java from a different .jar
- (e.g. java.lang.NoClassDefFoundError:
- org.chromium.content.common.CommandLine), And if
- chromium_content.jar is in fact in your java/libs directory (as
- placed by a gyp 'cp'), the following line will make sure it
- gets added to the classes.dex file. -->
- <property name="out.classes.absolute.dir" location="${jar.libs.dir}" />
+
+ <path id="out.dex.jar.input.ref">
+ <fileset file="${out.dir}/java/libs/chromium_content.jar"/>
+ <fileset file="${out.dir}/java/libs/chromium_net.jar"/>
+ <fileset file="${out.dir}/java/libs/chromium_base.jar"/>
+ <fileset file="${out.dir}/java/libs/chromium_media.jar"/>
+ </path>
+ <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
<!-- We expect PRODUCT_DIR to be set like the gyp var
(e.g. $ROOT/out/Debug) -->
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698