Upstream version 10.39.225.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 cdb149f..65774e5 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
@@ -111,11 +111,15 @@ setup_device() {
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="arm"
       ;;
-    intel_rhb | razr_i | x86)
+    intel_rhb | razr_i)
       DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="x86"
       ;;
+    x86)
+      DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
+      ANDROID_ARCH="x86"
+      ;;
     x86_64 | x64)
       DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"
       ANDROID_ARCH="x86_64"
@@ -124,7 +128,7 @@ setup_device() {
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=0"
       ANDROID_ARCH="arm"
       ;;
-    arm_v7_thumb | nvidia_logan)
+    arm_v7_thumb | nvidia_logan | nexus_5)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=1"
       ANDROID_ARCH="arm"
       ;;
@@ -193,12 +197,6 @@ adb_pull_if_needed() {
   ANDROID_SRC="$1"
   HOST_DST="$2"
 
-  if [ -d $HOST_DST ];
-  then
-    HOST_DST="${HOST_DST}/$(basename ${ANDROID_SRC})"
-  fi
-
-
   if [ -f $HOST_DST ];
   then
     #get the MD5 for dst and src