Merge branch 'master' into 'master'

do not run proguard in `ant debug` builds, it breaks the tests

The whole Android ant build system was built around the assumption that proguard is only run on the release builds.  Running proguard on the debug builds breaks the test instrumentation, which does something like insert the emma methods into each class.  In theory, this could be fixed, but I think its a bad idea to heavily customize the ant build system since its basically deprecated in favor of gradle.

Here's the proguard warning message:
`[proguard] Warning: can't find referenced class com.vladium.emma.rt.RT`

Instead, there is probably a way to test the release build. For example, in the Jenkins build, I added `ant clean release`, then it installs the APK, and runs the "monkey tester" on it.

See merge request !36
This commit is contained in:
Daniel Martí 2014-09-23 08:00:53 +00:00
commit fdb710dfd1

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="custom_rules">
<target name="javadoc" description="Generate Javadocs">
<javadoc sourcepath="${source.dir}"
destdir="${out.dir}/javadoc"
packagenames="org.fdroid.*"
windowtitle="${ant.project.name}"
doctitle="${ant.project.name}" />
</target>
<target name="-debug-obfuscation-check">
<property name="proguard.enabled" value="true"/>
<!--To avoid "Multiple dex files define..."-->
<path id="out.dex.jar.input.ref" />
</target>
</project>