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..20b319e7aa813c9b8b80b3339c23886e2a874371 100644 |
--- a/chrome/android/testshell/java/chromium_testshell_apk.xml |
+++ b/chrome/android/testshell/java/chromium_testshell_apk.xml |
@@ -15,7 +15,7 @@ |
<!-- 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}"/> |
<property name="gen.absolute.dir" value="${out.dir}/gen"/> |
<!-- Standard directory for chromium_*.jars --> |
@@ -27,17 +27,16 @@ |
<property name="native.libs.absolute.dir" location="${out.dir}/libs"/> |
<!-- Specify assets dir, this allows both mmm and SDK builds to use same pak files. --> |
<property-location name="asset.absolute.dir" location="${PRODUCT_DIR}/../assets/chrome"/> |
+ <!-- Set the output directory for the final apk to the ${apks.dir}. --> |
Yaron
2012/09/20 03:05:17
nit: indentaiton
David Trainor- moved to gerrit
2012/09/20 21:49:50
Done.
|
+ <property-location name="out.final.file" |
+ location="${apks.dir}/${ant.project.name}-debug.apk" |
+ check-exists="false"/> |
<property name="version.code" value="16"/> |
<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) --> |