Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / platform_tools / android / bin / android_setup.sh

diff --git a/src/third_party/skia/platform_tools/android/bin/android_setup.sh b/src/third_party/skia/platform_tools/android/bin/android_setup.sh
index 9ca8454..cdb149f 100755 (executable)
--- a/src/third_party/skia/platform_tools/android/bin/android_setup.sh
+++ b/src/third_party/skia/platform_tools/android/bin/android_setup.sh
@@ -11,6 +11,10 @@ while (( "$#" )); do
   if [[ "$1" == "-d" ]]; then
     DEVICE_ID=$2
     shift
+  elif [[ "$1" == "-i" || "$1" == "--resourcePath" ]]; then
+    RESOURCE_PATH=$2
+    APP_ARGS=("${APP_ARGS[@]}" "${1}" "${2}")
+    shift
   elif [[ "$1" == "-s" ]]; then
     DEVICE_SERIAL="-s $2"
     shift
@@ -112,6 +116,10 @@ setup_device() {
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="x86"
       ;;
+    x86_64 | x64)
+      DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"
+      ANDROID_ARCH="x86_64"
+      ;;
     arm_v7)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=0"
       ANDROID_ARCH="arm"
@@ -128,11 +136,24 @@ setup_device() {
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1"
       ANDROID_ARCH="arm"
       ;;
+    arm64)
+      DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
+      ANDROID_ARCH="arm64"
+      ;;
     mips)
       DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="mips"
       ;;
+    mips_dsp2)
+      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
+      DEFINES="${DEFINES} mips_arch_variant=mips32r2 mips_dsp=2"
+      ANDROID_ARCH="mips"
+      ;;
+    mips64)
+      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=64"
+      ANDROID_ARCH="mips64"
+      ;;
     *)
       if [ -z "$ANDROID_IGNORE_UNKNOWN_DEVICE" ]; then
           echo "ERROR: unknown device $TARGET_DEVICE"
@@ -205,11 +226,12 @@ adb_push_if_needed() {
   source $SCRIPT_DIR/utils/setup_adb.sh
 
   # read input params
-  HOST_SRC="$1"
-  ANDROID_DST="$2"
+  local HOST_SRC="$1"
+  local ANDROID_DST="$2"
 
   ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld $ANDROID_DST`
-  if [ "${ANDROID_LS:0:1}" == "d" ];
+  HOST_LS=`ls -ld $HOST_SRC`
+  if [ "${ANDROID_LS:0:1}" == "d" -a "${HOST_LS:0:1}" == "-" ];
   then
     ANDROID_DST="${ANDROID_DST}/$(basename ${HOST_SRC})"
   fi
@@ -229,10 +251,20 @@ adb_push_if_needed() {
       echo -n "$ANDROID_DST "
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
     fi
+  elif [ "${ANDROID_LS:0:1}" == "d" ]; then
+    for FILE_ITEM in `ls $HOST_SRC`; do
+      adb_push_if_needed "${HOST_SRC}/${FILE_ITEM}" "${ANDROID_DST}/${FILE_ITEM}"
+    done
   else
-    echo -n "$ANDROID_DST "
-    $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
-    $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
+    HOST_LS=`ls -ld $HOST_SRC`
+    if [ "${HOST_LS:0:1}" == "d" ]; then
+      $ADB $DEVICE_SERIAL shell mkdir -p $ANDROID_DST
+      adb_push_if_needed $HOST_SRC $ANDROID_DST
+    else
+      echo -n "$ANDROID_DST "
+      $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
+      $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
+    fi
   fi
 }