Index: build/android/ant/apk-compile.xml |
diff --git a/build/android/ant/apk-compile.xml b/build/android/ant/apk-compile.xml |
index 4f3d664aec9352847340e56820034c801a2b38e9..69dc6a8c4c6a89db17251a2f97bc0493725e8a29 100644 |
--- a/build/android/ant/apk-compile.xml |
+++ b/build/android/ant/apk-compile.xml |
@@ -122,9 +122,28 @@ |
<!-- get the project manifest package --> |
<xpath input="${out.manifest.abs.file}" |
expression="/manifest/@package" output="project.app.package" /> |
- <property name="create.test.jar.file" |
- location="${CREATE_TEST_JAR_PATH}" /> |
- <script language="javascript" src="${create.test.jar.file}"/> |
+ <loadresource property="project.app.packagepath"> |
+ <propertyresource name="project.app.package"/> |
+ <filterchain> |
+ <replacestring from="." to="/"/> |
+ </filterchain> |
+ </loadresource> |
+ <property name="create.test.jar.exclusions" |
+ value="${project.app.packagepath}/R.class ${project.app.packagepath}/R$*.class ${project.app.packagepath}/Manifest.class ${project.app.packagepath}/Manifest$*.class ${project.app.packagepath}/BuildConfig.class"/> |
+ <jar destfile="${TEST_JAR_PATH}" |
+ excludes="${create.test.jar.exclusions}" |
+ duplicate="preserve" |
+ > |
+ <restrict> |
+ <name name="**/*.class"/> |
+ <archives> |
+ <zips> |
+ <path refid="javac.custom.classpath"/> |
+ </zips> |
+ </archives> |
+ </restrict> |
+ <fileset dir="${out.dir}/classes"/> |
+ </jar> |
</then> |
</if> |