diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-11 13:57:29 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-11 13:57:29 +0000 |
| commit | ab4098b4d3ceb952dc7bea7e28a38387830acad6 (patch) | |
| tree | dcf4c0574bf65852e76c4ad790751182b6ae0acd /platform_tools | |
| parent | 9d5fedc5a6fb9476df0d7e5814c9c315b655d5c6 (diff) | |
add _thumb variants for arm devices
BUG=
R=djsollen@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/19024002
git-svn-id: http://skia.googlecode.com/svn/trunk@10001 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index efd39d1c2d..ca900ad2bb 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -69,10 +69,10 @@ if [ ! -d "$ANDROID_TOOLCHAIN" ]; then if [ ! -d "$TOOLCHAIN_DIR" ]; then mkdir $TOOLCHAIN_DIR fi - # enter the toolchain directory then download, unpack, and remove the tarball + # enter the toolchain directory then download, unpack, and remove the tarball pushd $TOOLCHAIN_DIR TARBALL=ndk-r$NDK_REV-v$API_LEVEL.tgz - + echo "Downloading $TARBALL ..." ${SCRIPT_DIR}/download_toolchains.py http://chromium-skia-gm.commondatastorage.googleapis.com/android-toolchains/$TARBALL $TOOLCHAIN_DIR/$TARBALL if [[ "$?" != "0" ]]; then @@ -144,16 +144,30 @@ setup_device() { DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0" DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" ;; + nexus_s_thumb) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" + DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" + ;; nexus_4 | nexus_7 | nexus_10) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0" ;; + nexus_4_thumb | nexus_7_thumb | nexus_10_thumb) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" + ;; xoom) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=0" ;; + xoom_thumb) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=1" + ;; galaxy_nexus) DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0" DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" ;; + galaxy_nexus_thumb) + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" + DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" + ;; razr_i) DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" @@ -203,8 +217,8 @@ adb_pull_if_needed() { fi echo "HOST: $HOST_DST" - - if [ -f $HOST_DST ]; + + if [ -f $HOST_DST ]; then #get the MD5 for dst and src ANDROID_MD5=`$ADB shell md5 $ANDROID_SRC` |