Re-organize Android scripts

platform_tools/android/bin/android_setup.sh

+#!/bin/bash
+#
+# android_setup.sh: Sets environment variables used by other Android scripts.
+
+# Parse the arguments for a DEVICE_ID.
+DEVICE_ID=""
+while (( "$#" )); do
+  if [[ $(echo "$1" | grep "^-d$") != "" ]];
+  then
+    DEVICE_ID=$2
+    shift
+  else
+    APP_ARGS="$APP_ARGS $1"
+  fi
+
+  shift
+done
+
+APP_ARGS=$(echo ${APP_ARGS} | sed 's/^ *//g')
+
 function exportVar {
   NAME=$1
   VALUE=$2
   echo export $NAME=\"$VALUE\"
   export $NAME="$VALUE"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # A valid Android SDK installation is required to build the sample app.
@@ skipping 87 matching lines @@
   LS="/bin/ls"  # Use directly to avoid any 'ls' alias that might be defined.
   GCC=$($LS $ANDROID_TOOLCHAIN/*-gcc | head -n1)
   if [ -z "$GCC" ]; then
     echo "ERROR: Could not find Android cross-compiler in: $ANDROID_TOOLCHAIN"
     return 1
   fi
 
   # Remove the '-gcc' at the end to get the full toolchain prefix
   ANDROID_TOOLCHAIN_PREFIX=${GCC%%-gcc}
 
-  exportVar AR "$ANDROID_TOOLCHAIN_PREFIX-ar"
   if [[ -z "$ANDROID_MAKE_CCACHE" ]]; then
-    exportVar CC "$ANDROID_TOOLCHAIN_PREFIX-gcc"
-    exportVar CXX "$ANDROID_TOOLCHAIN_PREFIX-g++"
-    exportVar LINK "$ANDROID_TOOLCHAIN_PREFIX-gcc"
+    export CC="$ANDROID_TOOLCHAIN_PREFIX-gcc"
+    export CXX="$ANDROID_TOOLCHAIN_PREFIX-g++"
+    export LINK="$ANDROID_TOOLCHAIN_PREFIX-gcc"
   else
-    exportVar CC "$ANDROID_MAKE_CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
-    exportVar CXX "$ANDROID_MAKE_CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++"
-    exportVar LINK "$ANDROID_MAKE_CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+    export CC="$ANDROID_MAKE_CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+    export CXX="$ANDROID_MAKE_CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++"
+    export LINK="$ANDROID_MAKE_CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
   fi
-  exportVar RANLIB "$ANDROID_TOOLCHAIN_PREFIX-ranlib"
-  exportVar OBJCOPY "$ANDROID_TOOLCHAIN_PREFIX-objcopy"
-  exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip"
+  export AR="$ANDROID_TOOLCHAIN_PREFIX-ar"
+  export RANLIB="$ANDROID_TOOLCHAIN_PREFIX-ranlib"
+  export OBJCOPY="$ANDROID_TOOLCHAIN_PREFIX-objcopy"
+  export STRIP="$ANDROID_TOOLCHAIN_PREFIX-strip"
 }
 
 # Helper function to configure the GYP defines to the appropriate values
 # based on the target device.
 setup_device() {
   DEFINES="OS=android"
   DEFINES="${DEFINES} host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')"
   DEFINES="${DEFINES} skia_os=android"
   DEFINES="${DEFINES} android_base=${SCRIPT_DIR}/.."
   DEFINES="${DEFINES} skia_shared_lib=1"
 
   # Setup the build variation depending on the target device
   TARGET_DEVICE="$1"
 
   if [ -z "$TARGET_DEVICE" ]; then
     echo "INFO: no target device type was specified so using the default 'arm_v7'"
     TARGET_DEVICE="arm_v7"
   fi
 
   case $TARGET_DEVICE in
     nexus_s)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
+      ANDROID_ARCH="arm"
       ;;
     nexus_4 | nexus_7 | nexus_10)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
+      ANDROID_ARCH="arm"
       ;;
     xoom)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb=1"
+      ANDROID_ARCH="arm"
       ;;
     galaxy_nexus)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
+      ANDROID_ARCH="arm"
       ;;
     razr_i)
       DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
+      ANDROID_ARCH="x86"
       ;;
     arm_v7)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=0"
+      ANDROID_ARCH="arm"
       ;;
     arm_v7_thumb)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=1"
+      ANDROID_ARCH="arm"
       ;;
     arm)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0"
+      ANDROID_ARCH="arm"
       ;;
     arm_thumb)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1"
+      ANDROID_ARCH="arm"
       ;;
     x86)
       DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
+      ANDROID_ARCH="x86"
       ;;
     *)
       echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: "
       echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm_v7_thumb x86"
       return 1;
       ;;
   esac
 
   echo "The build is targeting the device: $TARGET_DEVICE"
 
   # Set up the toolchain.
   setup_toolchain
+  if [[ "$?" != "0" ]]; then
+    return 1
+  fi
   DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
 
   # Use the "android" flavor of the Makefile generator for both Linux and OS X.
   exportVar GYP_GENERATORS "make-android"
   exportVar GYP_DEFINES "$DEFINES"
   exportVar SKIA_OUT "out/config/android-${TARGET_DEVICE}"
 }
 
 # adb_pull_if_needed(android_src, host_dst)
 adb_pull_if_needed() {
@@ skipping 21 matching lines @@
     if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ];
     then
       $ADB pull $ANDROID_SRC $HOST_DST
 #   else
 #      echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]"
     fi
   else
     $ADB pull $ANDROID_SRC $HOST_DST
   fi
 }
+
+# Set up the device.
+setup_device "${DEVICE_ID}"
+if [[ "$?" != "0" ]]; then
+  exit 1
+fi