Rest of cosmetic changes -- simpler, black theme with easier-to-touch buttons and...

[zxing.git] / android / build.xml

diff --git a/android/build.xml b/android/build.xml
index d2f7b74..9051234 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -173,7 +173,7 @@ limitations under the License.
 
   <!-- Compile this project's .java files into .class files. -->
   <target name="compile" depends="resource-src, aidl">
-    <javac encoding="ascii" target="1.5" debug="true" extdirs=""
+    <javac encoding="ascii" target="1.5" debug="false" extdirs=""
            destdir="${out-classes}"
            bootclasspathref="android.target.classpath">
       <src path="${source-folder}" />
@@ -202,10 +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"/>
-      <arg value="-optimizationpasses 4"/>
+      <arg value="-optimizationpasses 5"/>
+      <arg value="-optimizations !field/*,!class/merging/*"/> <!-- works around dex VerifyError -->
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>