Add gdb server variable for ant

This is the first CL to replace the ant property toolchain.dir with
android.gdbserver.

After this submitted
- Add android_gdbserver into WebKit gypis.
- Retire the toolchain.dir from ant by using android.gdbserver.
- Remove the ANDROID_TOOLCHAIN from both WebKit and chromium's gyp/gypi
- Remove the android_toolchain from envsetup_function.sh

TBR=jam
BUG=


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

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

7 files changed, 30 insertions, 7 deletions

diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 27996cb..3400051 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -92,31 +92,47 @@ common_vars_defines() {
   # and V8 mksnapshot.
   case "${TARGET_PRODUCT}" in
     "passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi")
-      DEFINES+=" target_arch=arm"
       DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1"
       DEFINES+=" ${ORDER_DEFINES}"
+      TARGET_ARCH="arm"
       ;;
     "trygon"|"tervigon")
-      DEFINES+=" target_arch=arm"
       DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
       DEFINES+=" ${ORDER_DEFINES}"
+      TARGET_ARCH="arm"
       ;;
     "full")
-      DEFINES+=" target_arch=arm"
       DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
+      TARGET_ARCH="arm"
       ;;
     *x86*)
     # TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.
-      DEFINES+=" target_arch=ia32 use_libffmpeg=0"
+      DEFINES+=" use_libffmpeg=0"
 
       host_arch=$(uname -m | sed -e \
         's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/')
       DEFINES+=" host_arch=${host_arch}"
+      TARGET_ARCH="x86"
       ;;
     *)
       echo "TARGET_PRODUCT: ${TARGET_PRODUCT} is not supported." >& 2
       return 1
   esac
+
+  case "${TARGET_ARCH}" in
+    "arm")
+      DEFINES+=" target_arch=arm"
+      ;;
+    "x86")
+      DEFINES+=" target_arch=ia32"
+      ;;
+    *)
+      echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
+      return 1
+  esac
+
+  DEFINES+=" android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/\
+android-${TARGET_ARCH}/gdbserver/gdbserver"
 }
 
 
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 942e286..eaab63f2 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -63,6 +63,8 @@
               '--ant-args',
               '-DANDROID_TOOLCHAIN=<(android_toolchain)',
               '--ant-args',
+              '-DANDROID_GDBSERVER=<(android_gdbserver)',
+              '--ant-args',
               '-DCHROMIUM_SRC=<(ant_build_out)/../..',
             ],
           }],
diff --git a/build/java.gypi b/build/java.gypi
index ef452f4..7e0369f 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -61,6 +61,7 @@
         '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
         '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+        '-DANDROID_GDBSERVER=<(android_gdbserver)',
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-jars.xml'
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 48340df..124ddb6 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -664,6 +664,7 @@
                 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
                 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
                 '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+                '-DANDROID_GDBSERVER=<(android_gdbserver)',
                 '-buildfile',
                 'shell/android/java/content_shell_apk.xml',
                 '<(CONFIGURATION_NAME)',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 2796bab..a5eb6fd 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -840,6 +840,7 @@
                 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
                 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
                 '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+                '-DANDROID_GDBSERVER=<(android_gdbserver)',
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
               ]
diff --git a/content/shell/content_shell_ant_helper.sh b/content/shell/content_shell_ant_helper.sh
index 9a013c7..e8687f4 100755
--- a/content/shell/content_shell_ant_helper.sh
+++ b/content/shell/content_shell_ant_helper.sh
@@ -6,13 +6,14 @@
 
 set -eu
 
-# A helper script to help convert the values of the fifth parameter for
+# A helper script to help convert the values of the last parameter for
 # ant building: 'Debug' -> 'debug'; 'Release' -> 'release'.
 # It's used by content/content_shell.gypi
 
-buildtype="$(echo "${11}" | tr '[A-Z]' '[a-z]')"
+buildtype="$(echo "${12}" | 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}" "${6}" "${7}" "${8}" "${9}" "${10}"
+exec "${1}" "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" "${10}"\
+ "${11}"
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 28d8819..b0c6be7 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -47,6 +47,7 @@
                 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
                 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
                 '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+                '-DANDROID_GDBSERVER=<(android_gdbserver)',
                 '-DCHROMIUM_SRC=<(ant_build_out)/../..',
                 '-buildfile',
                 '<(DEPTH)/testing/android/native_test_apk.xml',