Use the script helper to build of content shell on Android

BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=146954

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148053

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150292 0039d316-1c4b-4281-b951-d872f2087c98

content/content_shell.gypi

@@ -643,7 +643,7 @@
                 # Pass the build type to ant. Currently it only assumes
                 # debug mode in java. Release mode will break the current
                 # workflow.
-                # 'shell/content_shell_ant_helper.sh',
+                'shell/content_shell_ant_helper.sh',
                 'ant',
                 '-DPRODUCT_DIR=<(ant_build_out)',
                 '-DAPP_ABI=<(android_app_abi)',
@@ -654,7 +654,7 @@
                 '-DANDROID_TOOLCHAIN=<(android_toolchain)',
                 '-buildfile',
                 'shell/android/java/content_shell_apk.xml',
-                # '<(CONFIGURATION_NAME)',
+                '<(CONFIGURATION_NAME)',
               ],
               'dependencies': [
                 'content_java',

content/shell/content_shell_ant_helper.sh

@@ -10,9 +10,9 @@ set -eu
 # ant building: 'Debug' -> 'debug'; 'Release' -> 'release'.
 # It's used by content/content_shell.gypi
 
-buildtype="$(echo "${6}" | tr '[A-Z]' '[a-z]')"
+buildtype="$(echo "${11}" | tr '[A-Z]' '[a-z]')"
 
 # TODO(yongsheng): enable build type by adding "${buildtype}" into the
 # end of parameter list once the workflow is ready to support release
 # mode.
-exec "${1}" "${2}" "${3}" "${4}" "${5}"
+exec "${1}" "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" "${10}"