Index: chrome/android/testshell/java/chromium_testshell_apk.xml |
diff --git a/chrome/android/testshell/java/chromium_testshell_apk.xml b/chrome/android/testshell/java/chromium_testshell_apk.xml |
index a2e4b7a0ecca9690a9bcb5549961d65bca1b400b..5daef5ba708458634e9a9d1bf5b11a67f6bd9f14 100644 |
--- a/chrome/android/testshell/java/chromium_testshell_apk.xml |
+++ b/chrome/android/testshell/java/chromium_testshell_apk.xml |
@@ -15,9 +15,13 @@ |
<!-- Root directory for output --> |
<property-location name="out.dir" location="${PRODUCT_DIR}/chromium_testshell" |
check-exists="false"/> |
- <property name="resource.absolute.dir" value="res"/> |
+ <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> |
Ted C
2012/09/20 17:23:59
tabs...cough...tabs
down below as well.
David Trainor- moved to gerrit
2012/09/21 22:59:10
Done.
|
<property name="gen.absolute.dir" value="${out.dir}/gen"/> |
- |
+ <!-- Set the output directory for the final apk to the ${apks.dir}. --> |
+ <property-location name="out.final.file" |
+ location="${apks.dir}/${ant.project.name}-debug.apk" |
+ check-exists="false"/> |
+ |
<!-- Standard directory for chromium_*.jars --> |
<property-value name="lib.java.dir" value="${PRODUCT_DIR}/lib.java"/> |
<path id="native.libs.gdbserver"> |
@@ -32,12 +36,7 @@ |
<property name="version.name" value="0.1 Developer Build"/> |
<path id="out.dex.jar.input.ref"> |
- <pathelement location="${lib.java.dir}/chromium_base.jar"/> |
- <pathelement location="${lib.java.dir}/chromium_content.jar"/> |
- <pathelement location="${lib.java.dir}/chromium_media.jar"/> |
- <pathelement location="${lib.java.dir}/chromium_net.jar"/> |
- <pathelement location="${lib.java.dir}/chromium_chrome.jar"/> |
- <pathelement location="${lib.java.dir}/chromium_web_contents_delegate_android.jar"/> |
+ <filelist files="${INPUT_JARS_PATHS}"/> |
</path> |
<!-- We expect PRODUCT_DIR to be set like the gyp var (e.g. $ROOT/out/Debug) --> |