Add support for building apk in release

Until now, even in a Release configuration, apks were built in debug.
Now, they will be built in the correct configuration.

BUG=
TBR=torne

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

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

android/ant/chromium-apk.xml

@@ -3,8 +3,17 @@
   Use of this source code is governed by a BSD-style license that can be
   found in the LICENSE file.
 -->
-<project default="debug">
+<project default="error">
   <property name="ant.project.name" value="${APK_NAME}"/>
+  <!--
+    Gyp will pass CONFIGURATION_NAME as the target for ant to build. These targets will call the
+    appropriate sdk tools target.
+  -->
+  <target name="Debug" depends="debug"/>
+  <target name="Release" depends="release"/>
+  <target name="error">
+    <fail message="CONFIGURATION_NAME should be passed as a target to ant."/>
+  </target>
 
   <description>
     Building ${ant.project.name}.apk

java_apk.gypi

@@ -77,6 +77,8 @@
         '>@(additional_input_paths)',
       ],
       'outputs': [
+        # TODO(cjhopman): Apks are built with a -debug suffix even when they are
+        # built in release. This should be fixed.
         '<(PRODUCT_DIR)/apks/<(apk_name)-debug.apk',
       ],
       'action': [
@@ -102,7 +104,11 @@
 
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',
-        '<(DEPTH)/build/android/ant/chromium-apk.xml'
+        '<(DEPTH)/build/android/ant/chromium-apk.xml',
+
+        # Specify CONFIGURATION_NAME as the target for ant to build. The
+        # buildfile will then build the appropriate SDK tools target.
+        '<(CONFIGURATION_NAME)',
       ]
     },
   ],