More aggressive inlining, to inline some key methods like BitArray.get(), resulting...

[zxing.git] / android / build.xml

diff --git a/android/build.xml b/android/build.xml
index 04bd85e..57b6d53 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -72,6 +72,18 @@
         </not>
       </condition>
     </fail>
+    <fail message="Please put proguard.jar in 'bin' under the WTK install directory">
+      <condition>
+        <and>
+          <not>
+            <isset property="debug"/>
+          </not>
+          <not>
+            <available file="${WTK-home}/bin/proguard.jar" type="file"/>
+          </not>
+        </and>
+      </condition>
+    </fail>
   </target>
 
   <!-- Create the output directories if they don't exist yet. -->
@@ -82,6 +94,13 @@
 
   <!-- Generate the R.java file for this project's resources. -->
   <target name="resource-src" depends="dirs">
+
+    <copy file="strings.xml.template" tofile="res/values/strings.xml" overwrite="true">
+      <filterset>
+        <filter token="VERSION" value="${version}"/>
+      </filterset>
+    </copy>
+
     <echo>Generating R.java...</echo>
     <exec executable="${aapt}" failonerror="true">
       <arg value="compile"/>
@@ -107,8 +126,8 @@
   </target>
 
   <!-- Compile this project's .java files into .class files. -->
-  <target name="compile" depends="init, dirs, resource-src, aidl">
-    <javac encoding="ascii" target="1.5" debug="false" optimize="true" extdirs=""
+  <target name="compile" depends="init, clean, dirs, resource-src, aidl">
+    <javac encoding="ascii" target="1.5" debug="true" optimize="true" extdirs=""
            srcdir="."
            destdir="${outdir-classes}"
            bootclasspath="${android-jar}">
@@ -119,18 +138,18 @@
     <unzip src="../core/core.jar" dest="${outdir-classes}"/>
   </target>
 
-  <target name="optimize" depends="compile">
+  <target name="optimize" depends="compile" unless="debug">
     <jar basedir="${outdir-classes}" destfile="temp.jar"/>
     <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 optimized.jar"/>
      <arg value="-libraryjars ${android-jar}"/>
      <arg value="-dontpreverify"/>
      <arg value="-dontobfuscate"/>
      <arg value="-keep public class com.google.zxing.client.android.BarcodeReaderCaptureActivity"/>
-     <arg value="-keep public class com.google.zxing.qrcode.detector.DefaultGridSampler"/>
-     <arg value="-keep public class com.google.zxing.qrcode.detector.GridSampler"/>      
-     <arg value="-optimizationpasses 4"/>
+     <arg value="-optimizationpasses 7"/>
+     <arg value="-overloadaggressively"/>
      <arg value="-verbose"/>
    </java>
    <delete file="temp.jar"/>
@@ -142,12 +161,30 @@
 
   <!-- Convert this project's .class files into .dex files. -->
   <target name="dex" depends="compile, optimize">
+
+    <condition property="locals" value="full">
+      <isset property="debug"/>
+    </condition>
+    <condition property="locals" value="none">
+      <not>
+        <isset property="debug"/>
+      </not>
+    </condition>
+    <condition property="positions" value="lines">
+      <isset property="debug"/>
+    </condition>
+    <condition property="positions" value="none">
+      <not>
+        <isset property="debug"/>
+      </not>
+    </condition>
+
     <exec executable="${dx}" failonerror="true">
       <arg value="-JXmx384M"/>
       <arg value="--dex"/>
       <arg value="--output=${intermediate-dex}"/>
-      <arg value="--locals=none"/>
-      <arg value="--positions=none"/>
+      <arg value="--locals=${locals}"/>
+      <arg value="--positions=${positions}"/>
       <arg path="${outdir-classes}"/>
     </exec>
   </target>