Set the ant keystore properties earlier

apk-build.xml sets the has.keystore property before the point where we
were setting the properties that it bases has.keystore on. This caused
Release builds to be built incorrectly (i.e. the build didn't sign
them).


BUG=184532
NOTRY=true
TBR=yfriedman@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12735007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@187598 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/ant/apk-build.xml

@@ -262,6 +262,18 @@
         <istrue value="${verbose}" />
     </condition>
 
+    <!--
+      For debug builds, the Android SDK tools create a key in ~/.android and sign the build with it.
+      This has caused all kinds of issues. Instead, the debug build should be signed with a key in
+      build/android/ant. The SDK tools do not provide any support for overriding that behavior and so
+      instead one must use the hack below.
+    -->
+    <property name="key.store" value="${CHROMIUM_SRC}/build/android/ant/chromium-debug.keystore"/>
+    <property name="key.store.password" value="chromium"/>
+    <property name="key.alias" value="chromiumdebugkey"/>
+    <property name="key.alias.password" value="chromium"/>
+
+
     <!-- properties for signing in release mode -->
     <condition property="has.keystore">
         <and>
@@ -1152,17 +1164,6 @@
         <property name="proguard.enabled" value="false"/>
     </target>
 
-    <!--
-      For debug builds, the Android SDK tools create a key in ~/.android and sign the build with it.
-      This has caused all kinds of issues. Instead, the debug build should be signed with a key in
-      build/android/ant. The SDK tools do not provide any support for overriding that behavior and so
-      instead one must use the hack below.
-    -->
-    <property name="key.store" value="${CHROMIUM_SRC}/build/android/ant/chromium-debug.keystore"/>
-    <property name="key.store.password" value="chromium"/>
-    <property name="key.alias" value="chromiumdebugkey"/>
-    <property name="key.alias.password" value="chromium"/>
-
     <!-- SDK tools assume that out.packaged.file is signed and name it "...-unaligned" -->
     <property name="out.packaged.file"
       value="${apks.dir}/${ant.project.name}-unsigned.apk" />