X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fbuild.xml;h=5892b8c64233e49ce7bb4ac1b5d708802b9b0185;hb=7051cf2550f33df4e550b843066003dacdfae23d;hp=9afa3a155913f11f25cf770dcd8656062adff3d6;hpb=061a24511161b892fb0a9d1f312a142e7a6ab3d9;p=zxing.git

diff --git a/android/build.xml b/android/build.xml
index 9afa3a15..5892b8c6 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -130,8 +130,9 @@ limitations under the License.
 
   <!-- rules -->
 
-  <!-- Create the output directories if they don't exist yet. -->
-  <target name="dirs">
+  <!-- Create the output directories if they don't exist yet. All builds do a clean first
+  to prevent stale resources and to make ProGuard happy. -->
+  <target name="dirs" depends="clean">
     <echo>Creating output directories if needed...</echo>
     <mkdir dir="${resource-folder}" />
     <mkdir dir="${external-libs-folder}" />
@@ -201,8 +202,10 @@ 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"/>
-      <arg value="-optimizationpasses 7"/>
+      <arg value="-optimizationpasses 4"/>
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>