Index: build/android/ant/apk-obfuscate.xml |
diff --git a/build/android/ant/apk-obfuscate.xml b/build/android/ant/apk-obfuscate.xml |
index b15ce7365eb590d28a5ae75d4d911f9090c4da4b..4e737dae59ed936ac9b200456bd10288da7b6b55 100644 |
--- a/build/android/ant/apk-obfuscate.xml |
+++ b/build/android/ant/apk-obfuscate.xml |
@@ -69,9 +69,27 @@ |
<!-- 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> |
<if> |