Revert 193160 "[Android] Extract signing+zipaligning to python"

trunk/src/build/android/ant/apk-package.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2005-2008 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
          http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 
-<project default="-package">
+<project default="-do-sign">
   <property name="verbose" value="false" />
   <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}"/>
@@ skipping 10 matching lines @@
   <!-- Custom tasks -->
   <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
 
   <condition property="build.target" value="release" else="debug">
     <equals arg1="${CONFIGURATION_NAME}" arg2="Release" />
   </condition>
   <condition property="build.is.packaging.debug" value="true" else="false">
     <equals arg1="build.target" arg2="debug" />
   </condition>
 
+  <property name="out.final.file" location="${FINAL_APK_PATH}" />
+
   <!-- 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="out.packaged.file" value="${out.dir}/${APK_NAME}-unsigned.apk" />
+  <property name="out.unaligned.file" value="${out.dir}/${APK_NAME}-unaligned.apk" />
 
   <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" />
@@ skipping 93 matching lines @@
         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>
   </target>
+
+
+
+  <property name="key.store" value="${KEYSTORE_PATH}"/>
+  <property name="key.store.password" value="chromium"/>
+  <property name="key.alias" value="chromiumdebugkey"/>
+  <property name="key.alias.password" value="chromium"/>
+  <property name="zipalign" location="${android.tools.dir}/zipalign" />
+
+  <!-- Signs and zipaligns the apk. -->
+  <target name="-do-sign" depends="-package">
+    <sequential>
+      <echo level="info">Signing final apk...</echo>
+      <signapk
+          input="${out.packaged.file}"
+          output="${out.unaligned.file}"
+          keystore="${key.store}"
+          storepass="${key.store.password}"
+          alias="${key.alias}"
+          keypass="${key.alias.password}" />
+
+      <zipalign
+          executable="${zipalign}"
+          input="${out.unaligned.file}"
+          output="${out.final.file}"
+          verbose="${verbose}" />
+      <echo level="info">Release Package: ${out.final.file}</echo>
+    </sequential>
+  </target>
 </project>