Use RSS14 on the command line; scan more lines since RSS14 stacked kind of needs...

[zxing.git] / android / build.xml

diff --git a/android/build.xml b/android/build.xml
index 1ee9a12..d619e40 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -194,7 +194,7 @@ limitations under the License.
   <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">
+    <java jar="${proguard-jar}" fork="true" failonerror="true">
       <jvmarg value="-Dmaximum.inlined.code.length=48"/>
       <arg value="-injars ${out-classes}"/>
       <arg value="-outjars optimized"/>
@@ -205,7 +205,8 @@ limitations under the License.
       <!-- 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 4"/>
+      <!-- Keeping this low also avoids some weird Android/ProGuard issue I couldn't resolve otherwise --> 
+      <arg value="-optimizationpasses 2"/>
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>