Reinstate more optimization, but avoid disagreement with dex by properly disabling...

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

diff --git a/android/build.xml b/android/build.xml
index d619e40..fa683d6 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -202,11 +202,9 @@ limitations under the License.
       <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.book.SearchBookContents* { public * ; }"/>
-      <!-- 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"/>
-      <!-- Keeping this low also avoids some weird Android/ProGuard issue I couldn't resolve otherwise --> 
-      <arg value="-optimizationpasses 2"/>
+      <arg value="-optimizationpasses 5"/>
+      <arg value="-optimizations !field/*,!class/merging/*"/> <!-- works around dex VerifyError -->
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>