Tweak to compile with Android 1.5 but still work in 1.1

[zxing.git] / androidtest / build.xml

diff --git a/androidtest/build.xml b/androidtest/build.xml
index dde1b85..d0288ff 100644 (file)
--- a/androidtest/build.xml
+++ b/androidtest/build.xml
@@ -189,7 +189,8 @@ limitations under the License.
       <arg value="-outjars temp-optimized.jar"/>
       <arg value="-libraryjars ${android-jar}"/>
       <arg value="-keepattributes Exceptions,InnerClasses,Signature,!LocalVariableTable,!LocalVariableTypeTable"/>
-      <arg value="-keep class com.google.zxing.client.android.*Activity"/>
+      <arg value="-keep class com.google.zxing.client.androidtest.*Activity"/>
+      <arg value="-keep class com.google.zxing.client.androidtest.ViewfinderView { public * ; }"/>
       <arg value="-target 5"/>
       <arg value="-optimizationpasses 7"/>
       <arg value="-dontshrink"/>
@@ -262,10 +263,7 @@ limitations under the License.
     </exec>
   </target>
 
-  <!-- Invoke the proper target depending on whether or not
-an assets directory is present. -->
-  <!-- TODO: find a nicer way to include the "-A ${asset-dir}" argument
-only when the assets dir exists. -->
+  <!-- Invoke the proper target depending on whether or not an assets directory is present. -->
   <target name="package-res">
     <available file="${asset-dir}" type="dir"
                property="res-target" value="and-assets" />