Add gdb server variable for ant

build/android/envsetup_functions.sh

Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 27996cbff33e48bbcdd79c0f2f30c2fb50f48867..34000517ca82fc14b0faea38d0b080aa801e0884 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

[Yaron, 2012/08/29 23:22:26]

Couldn't you simplify to: DEFINES+="target_arch=${TARGET_ARCH}"?

[michaelbai, 2012/08/29 23:40:07]

I tried, got some errors, The ia32 seemed be used before it change to x86, I
will try to replace ia32 with x86 in another CL.

On 2012/08/29 23:22:26, Yaron wrote:

[Isaac (away), 2012/08/30 03:08:13]

how about:

# TODO(michaelbai)
DEFINES+="target_arch=${TARGET_ARCH/x86/ia32}"

This will do the same thing as case statement.  Downside is its a little hard to
read though...

[Peter Beverloo, 2012/08/30 11:08:18]

Why was this block moved out of the switch statement above? I don't think the
few extra lines in the TARGET_PRODUCT switch will matter that much. We could
default it to "arm" outside the switch and only override it for x86 builds.

[michaelbai, 2012/08/30 14:59:39]

Finally, we will use DEFINES+="target_arch=${TARGET_ARCH}" as long as ia32 could
be completely replaced with x86. Let's use this for now.

[Peter Beverloo, 2012/08/30 16:07:33]

To illustrate my suggestion (not tested, has a typo too):
https://chromiumcodereview.appspot.com/10916013

I think that's a lot cleaner and introduces less new code.

+    "arm")
+      DEFINES+=" target_arch=arm"
+      ;;
+    "x86")
+      DEFINES+=" target_arch=ia32"
+      ;;
+    *)
+      echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
+      return 1
+  esac

[Peter Beverloo, 2012/08/30 11:08:18]

It's impossible to reach the default case here, considering every allowed
TARGET_PRODUCT defines a TARGET_ARCH and the function returns when an invalid
one is ran in to.

[michaelbai, 2012/08/30 14:59:39]

It could be if TARGET_ARCH set to something other than x86 and arm, but the
author forget to update this block.

On 2012/08/30 11:08:18, Peter Beverloo wrote:

[Peter Beverloo, 2012/08/30 16:07:33]

That seems very unlikely in the near future.

+
+  DEFINES+=" android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/\
+android-${TARGET_ARCH}/gdbserver/gdbserver"
 }