Change notes for 1.6

[zxing.git] / android / build.xml

diff --git a/android/build.xml b/android/build.xml
index d50f5bf..ad9bead 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -97,9 +97,6 @@ limitations under the License.
   <!-- folder for the 3rd party java libraries -->
   <!--<property name="external-libs-folder" value="../core" />-->
 
-  <!-- folder for the native libraries -->
-  <property name="native-libs-folder" value="libs" />
-
   <!-- Output directories -->
   <property name="gen-folder" value="gen" />
   <property name="out-folder" value="bin" />
@@ -262,13 +259,14 @@ limitations under the License.
   <target name="debug" depends="dex, package-resources">
     <apkbuilder
         outfolder="${out-folder}"
-        basename="${ant.project.name}"
+        resourcefile="BarcodeScanner.ap_"
+        apkfilepath="${out-folder}/BarcodeScanner-debug.apk"
+        debug="true"
         signed="true"
         verbose="false">
-      <file path="${intermediate-dex}" />
+      <dex path="${intermediate-dex-location}" />
       <sourcefolder path="${source-folder}" />
       <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">
@@ -291,7 +289,6 @@ limitations under the License.
       <file path="${intermediate-dex}" />
       <sourcefolder path="${source-folder}" />
       <jarfolder path="${external-libs-folder}" />
-      <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>