<!-- rules -->
- <!-- Create the output directories if they don't exist yet. -->
- <target name="dirs">
+ <!-- Create the output directories if they don't exist yet. All builds do a clean first
+ to prevent stale resources and to make ProGuard happy. -->
+ <target name="dirs" depends="clean">
<echo>Creating output directories if needed...</echo>
<mkdir dir="${resource-folder}" />
<mkdir dir="${external-libs-folder}" />
<unzip src="../core/core.jar" dest="${out-classes}" overwrite="true"/>
- <!-- Optimize with ProGuard; can comment out this section to disable it -->
+ <antcall target="optimize"/>
+ </target>
+
+ <target name="optimize" unless="no-optimize">
<mkdir dir="optimized"/>
<property name="libraryjars.path" refid="android.target.classpath"/>
<java jar="${WTK-home}/bin/proguard.jar" fork="true" failonerror="true">
<arg value="-keep class com.google.zxing.client.android.*Activity"/>
<arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/>
<arg value="-keep class com.google.zxing.client.android.book.SearchBookContents* { public * ; }"/>
+ <!-- This works around some strange Android/ProGuard problem verifying MaskUtil -->
+ <arg value="-keep class com.google.zxing.qrcode.encoder.MaskUtil { public * ; }"/>
<arg value="-target 5"/>
- <arg value="-optimizationpasses 7"/>
+ <arg value="-optimizationpasses 4"/>
<arg value="-dontshrink"/>
<arg value="-dontobfuscate"/>
<arg value="-dontskipnonpubliclibraryclasses"/>
</java>
<delete dir="${out-classes}"/>
<move file="optimized" tofile="${out-classes}"/>
- <!-- End optimization -->
</target>
<!-- Convert this project's .class files into .dex files. -->