[Android] Split Ant -package and -package-resources

build/android/ant/apk-package-resources.xml

Index: build/android/ant/apk-package-resources.xml
diff --git a/build/android/ant/apk-package.xml b/build/android/ant/apk-package-resources.xml
similarity index 78%
copy from build/android/ant/apk-package.xml
copy to build/android/ant/apk-package-resources.xml
index 6540d9988612322ec0598d638946626017b6c5b1..cbce1deb95f4a96288468d8c775c8813a7665298 100644
--- a/build/android/ant/apk-package.xml
+++ b/build/android/ant/apk-package-resources.xml
@@ -15,18 +15,14 @@
     limitations under the License.
 -->
 
-<project default="-package">
-  <property name="verbose" value="false" />
+<project default="-package-resources">
   <property name="out.dir" location="${OUT_DIR}" />
-  <!-- Output directories -->
-  <property name="out.dir" value="bin" />
   <property name="out.absolute.dir" location="${out.dir}" />
   <property name="out.res.absolute.dir" location="${out.dir}/res" />
   <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" />
 
   <!-- tools location -->
   <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
-  <property name="target" value="android-${ANDROID_SDK_VERSION}"/>
   <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
   <property name="android.tools.dir" location="${sdk.dir}/tools" />
   <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tools" />
@@ -46,34 +42,14 @@
     <equals arg1="build.target" arg2="debug" />
   </condition>
 
-  <!-- Disables automatic signing. -->
-  <property name="build.is.signing.debug" value="false"/>
-
-  <!-- SDK tools assume that out.packaged.file is signed and name it "...-unaligned" -->
-  <property name="out.packaged.file" value="${UNSIGNED_APK_PATH}" />
-
   <property name="resource.dir" value="${RESOURCE_DIR}"/>
   <property name="resource.absolute.dir" location="${resource.dir}"/>
 
   <property name="asset.dir" value="${ASSET_DIR}" />
   <property name="asset.absolute.dir" location="${asset.dir}" />
 
-  <property name="native.libs.absolute.dir" location="${NATIVE_LIBS_DIR}" />
-
   <property name="aapt" location="${android.platform.tools.dir}/aapt" />
 
-  <target name="-crunch">
-    <!-- Updates the pre-processed PNG cache -->
-    <exec executable="${aapt}" taskName="crunch">
-      <arg value="crunch" />
-      <arg value="-v" />
-      <arg value="-S" />
-      <arg path="${resource.absolute.dir}" />
-      <arg value="-C" />
-      <arg path="${out.res.absolute.dir}" />
-    </exec>
-  </target>
-
   <property name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/>
   <property name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/>
 
@@ -114,6 +90,18 @@
   <!-- Intermediate files -->
   <property name="resource.package.file.name" value="${APK_NAME}.ap_" />
 
+  <target name="-crunch">
+    <!-- Updates the pre-processed PNG cache -->
+    <exec executable="${aapt}" taskName="crunch">
+      <arg value="crunch" />
+      <arg value="-v" />
+      <arg value="-S" />
+      <arg path="${resource.absolute.dir}" />
+      <arg value="-C" />
+      <arg path="${out.res.absolute.dir}" />
+    </exec>
+  </target>
+
   <target name="-package-resources" depends="-crunch">
     <aapt
         executable="${aapt}"
@@ -139,29 +127,7 @@
       <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
       <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw -->
     </aapt>
-  </target>
 
-  <property name="dex.file.name" value="classes.dex" />
-  <property name="intermediate.dex.file" location="${out.absolute.dir}/${dex.file.name}" />
-  <property name="source.dir" value="${SOURCE_DIR}" />
-  <property name="source.absolute.dir" location="${source.dir}" />
-
-
-  <!-- Packages the application. -->
-  <target name="-package" depends="-package-resources">
-    <apkbuilder
-        outfolder="${out.absolute.dir}"
-        resourcefile="${resource.package.file.name}"
-        apkfilepath="${out.packaged.file}"
-        debugpackaging="${build.is.packaging.debug}"
-        debugsigning="${build.is.signing.debug}"
-        verbose="${verbose}"
-        hascode="true"
-        previousBuildType="/"
-        buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
-      <dex path="${intermediate.dex.file}"/>
-      <sourcefolder path="${source.absolute.dir}"/>
-      <nativefolder path="${native.libs.absolute.dir}" />
-    </apkbuilder>
+    <touch file="${STAMP}" />
   </target>
 </project>