X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fbuild.xml;h=905123489d721c71e656d11cacadb3d6adccba4b;hb=3099090045ff845693aaaa73fa3079365a6b801d;hp=24f0f1e5b7a8d07bba03314c4d1b57e4efa3f3ed;hpb=a9128375bab7016a042e577535c6613340ffcc07;p=zxing.git

diff --git a/android/build.xml b/android/build.xml
index 24f0f1e5..90512348 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}" />
@@ -172,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}" />
@@ -193,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"/>
@@ -202,7 +203,8 @@ 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 4"/>
+      <arg value="-optimizationpasses 5"/>
+      <arg value="-optimizations !field/*,!class/merging/*"/> <!-- works around dex VerifyError -->
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>
@@ -268,6 +270,14 @@ limitations under the License.
       <jarfolder path="${external-libs-folder}" />
       <nativefolder path="${native-libs-folder}" />
     </apkbuilder>
+    <copy file="${out-folder}/BarcodeScanner-debug.apk" tofile="${out-folder}/temp.apk" overwrite="true"/>
+    <exec executable="${android-tools}/zipalign">
+      <arg value="-f"/>
+      <arg value="-v"/>
+      <arg value="4"/>
+      <arg value="${out-folder}/temp.apk"/>      
+      <arg value="${out-folder}/BarcodeScanner-debug.apk"/>
+    </exec>
   </target>
 
   <!-- Package the application without signing it.
@@ -284,6 +294,7 @@ limitations under the License.
       <nativefolder path="${native-libs-folder}" />
     </apkbuilder>
     <echo>All generated packages need to be signed with jarsigner before they are published.</echo>
+    <echo>Also run zipalign -f -v 4 BarcodeScanner.apk BarcodeScanner-aligned.apk after signing</echo>
   </target>
 
   <!-- Install the package on the default emulator -->