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

git-svn-id: http://zxing.googlecode.com/svn/trunk@311 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/build.xml b/android/build.xml
index 7fd06fe..57b6d53 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -141,6 +141,7 @@
   <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}"/>

diff --git a/javame/build.xml b/javame/build.xml
index a66db08..20177a4 100644 (file)
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -138,13 +138,13 @@
 
     <move file="${jar-name}.jar" tofile="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 ${jar-name}.jar"/>
       <arg value="-libraryjars ${WTK-home}/lib/cldcapi11.jar"/>
       <arg value="-libraryjars ${WTK-home}/lib/midpapi20.jar"/>
       <arg value="-libraryjars ${WTK-home}/lib/mmapi.jar"/>
       <arg value="-libraryjars ${WTK-home}/lib/jsr234.jar"/>
-      <arg value="-libraryjars ../core/core.jar"/>
       <arg value="-microedition"/>
       <arg value="-keep public class com.google.zxing.client.j2me.ZXingMIDlet"/>
       <arg value="-optimizationpasses 7"/>