X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fbuild.xml;h=24f0f1e5b7a8d07bba03314c4d1b57e4efa3f3ed;hb=608fe313d82bb79f0f5a96856697bdfb4a6305d3;hp=8afd48b7376666d811c0e79ce344b0cf7cb06d4a;hpb=1cffc07331fd24d3bf59dbb7c4040bea362dffd1;p=zxing.git

diff --git a/android/build.xml b/android/build.xml
index 8afd48b7..24f0f1e5 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -185,8 +185,12 @@ limitations under the License.
       </classpath>
     </javac>
 
-    <!-- Optimize with ProGuard -->
     <unzip src="../core/core.jar" dest="${out-classes}" overwrite="true"/>
+
+    <antcall target="optimize"/>
+  </target>
+
+  <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">
@@ -196,9 +200,9 @@ limitations under the License.
       <arg value="-libraryjars ${libraryjars.path}"/>
       <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.SearchBookContents* { public * ; }"/>
+      <arg value="-keep class com.google.zxing.client.android.book.SearchBookContents* { public * ; }"/>
       <arg value="-target 5"/>
-      <arg value="-optimizationpasses 9"/>
+      <arg value="-optimizationpasses 4"/>
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>