Adjust optimization options: make sure to actually exclude more unused code, but...

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

diff --git a/core/build.xml b/core/build.xml
index c76c709..b890d90 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -54,7 +54,9 @@
       <arg value="-libraryjars ${WTK-home}/lib/cldcapi11.jar"/>
       <arg value="-renamesourcefileattribute SourceFile"/>
       <arg value="-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod"/>
-      <arg value="-keep class * { !private *; }"/>
+      <arg value="-keep public class com.google.zxing.* { public protected *; }"/>
+      <arg value="-keep public class com.google.zxing.client.result.* { public protected *; }"/>
+      <arg value="-keep public class com.google.zxing.common.* { public protected *; }"/>
       <arg value="-optimizationpasses 7"/>
       <arg value="-overloadaggressively"/>
       <arg value="-allowaccessmodification"/>
@@ -63,7 +65,7 @@
     <delete file="temp.jar"/>
   </target>
 
-  <target name="build-test" depends="init,build-optimized">
+  <target name="build-test" depends="init,build">
     <fail message="Please build 'javase' first">
       <condition>
         <not>