Fixed some sporadic crashes.

[zxing.git] / android / build.xml

diff --git a/android/build.xml b/android/build.xml
index c07d858..24f0f1e 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -187,7 +187,10 @@ limitations under the License.
 
     <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">
@@ -199,7 +202,7 @@ limitations under the License.
       <arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/>
       <arg value="-keep class com.google.zxing.client.android.book.SearchBookContents* { public * ; }"/>
       <arg value="-target 5"/>
-      <arg value="-optimizationpasses 7"/>
+      <arg value="-optimizationpasses 4"/>
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>
@@ -208,7 +211,6 @@ limitations under the License.
     </java>
     <delete dir="${out-classes}"/>
     <move file="optimized" tofile="${out-classes}"/>
-    <!-- End optimization -->
   </target>
 
   <!-- Convert this project's .class files into .dex files. -->