to find the SDK location, I've removed it and pointed us at the global ZXing build.properties. -->
<property file="../build.properties"/>
<!-- Parts of the Android build system insist on the name 'sdk-location', so alias it. -->
- <property name="sdk-location" value="${android-home}"/>
+ <property name="sdk.dir" value="${android-home}"/>
<!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the default property values
<!-- Custom Android task to deal with the project target, and import the proper rules.
This requires ant 1.6.0 or above. -->
<path id="android.antlibs">
- <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
- <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
- <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
- <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
- <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
</path>
<taskdef name="setup"
<!-- Properties -->
- <property name="android-tools" value="${sdk-location}/tools" />
+ <property name="android-tools" value="${sdk.dir}/tools" />
<!-- Input directories -->
<property name="source-folder" value="src" />
<!-- 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}" />
<arg value="-S" />
<arg path="${resource-folder}" />
<arg value="-I" />
- <arg path="${android-jar}" />
+ <arg path="${android.jar}" />
</exec>
</target>
<!-- Compile this project's .java files into .class files. -->
<target name="compile" depends="resource-src, aidl">
- <javac encoding="ascii" target="1.5" debug="true" extdirs=""
+ <javac encoding="ascii" target="1.5" debug="false" extdirs=""
destdir="${out-classes}"
bootclasspathref="android.target.classpath">
<src path="${source-folder}" />
</classpath>
</javac>
- <!-- Optimize with ProGuard -->
<unzip src="../core/core.jar" dest="${out-classes}" overwrite="true"/>
- <jar jarfile="temp.jar" basedir="${out-classes}"/>
- <delete dir="${out-classes}"/>
- <mkdir dir="${out-classes}"/>
+
+ <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">
- <jvmarg value="-Dmaximum.inlined.code.length=32"/>
- <arg value="-injars temp.jar"/>
- <arg value="-outjars temp-optimized.jar"/>
+ <java jar="${proguard-jar}" fork="true" failonerror="true">
+ <jvmarg value="-Dmaximum.inlined.code.length=48"/>
+ <arg value="-injars ${out-classes}"/>
+ <arg value="-outjars optimized"/>
<arg value="-libraryjars ${libraryjars.path}"/>
<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.SearchBookContents* { public * ; }"/>
+ <arg value="-keep class com.google.zxing.client.android.book.SearchBookContents* { public * ; }"/>
<arg value="-target 5"/>
- <arg value="-optimizationpasses 7"/>
+ <arg value="-optimizationpasses 5"/>
+ <arg value="-optimizations !field/*,!class/merging/*"/> <!-- works around dex VerifyError -->
<arg value="-dontshrink"/>
<arg value="-dontobfuscate"/>
<arg value="-dontskipnonpubliclibraryclasses"/>
<arg value="-verbose"/>
<arg value="-dump proguard-dump.txt"/>
</java>
- <delete file="temp.jar"/>
- <unzip src="temp-optimized.jar" dest="${out-classes}" overwrite="true"/>
- <delete file="temp-optimized.jar"/>
+ <delete dir="${out-classes}"/>
+ <move file="optimized" tofile="${out-classes}"/>
</target>
<!-- Convert this project's .class files into .dex files. -->
manifest="AndroidManifest.xml"
resources="${resource-folder}"
assets="${asset-folder}"
- androidjar="${android-jar}"
+ androidjar="${android.jar}"
outfolder="${out-folder}"
basename="${ant.project.name}" />
</target>
<jarfolder path="${external-libs-folder}" />
<nativefolder path="${native-libs-folder}" />
</apkbuilder>
+ <copy file="${out-folder}/BarcodeScanner-debug.apk" tofile="${out-folder}/temp.apk" overwrite="true"/>
+ <exec executable="${android-tools}/zipalign">
+ <arg value="-f"/>
+ <arg value="-v"/>
+ <arg value="4"/>
+ <arg value="${out-folder}/temp.apk"/>
+ <arg value="${out-folder}/BarcodeScanner-debug.apk"/>
+ </exec>
</target>
<!-- Package the application without signing it.
<nativefolder path="${native-libs-folder}" />
</apkbuilder>
<echo>All generated packages need to be signed with jarsigner before they are published.</echo>
+ <echo>Also run zipalign -f -v 4 BarcodeScanner.apk BarcodeScanner-aligned.apk after signing</echo>
</target>
<!-- Install the package on the default emulator -->