AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update the Android scripts to refresh device names and capabilities.

Browse Source 
Review URL: https://codereview.chromium.org/1054633002
This commit is contained in:
djsollen 2015-04-01 12:15:39 -07:00 committed by Commit bot
parent 68b204e61c
commit 48c3534541
1 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
platform_tools/android/bin/android_setup.sh
View File

@ -1,4 +1,10 @@
#!/bin/bash
###############################################################################
# Copyright 2015 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
###############################################################################
#
# android_setup.sh: Sets environment variables used by other Android scripts.
@ -91,34 +97,27 @@ setup_device() {
TARGET_DEVICE=$(cat .android_config)
verbose "no target device (-d), using ${TARGET_DEVICE} from most recent build"
else
TARGET_DEVICE="arm_v7_thumb"
TARGET_DEVICE="arm_v7"
verbose "no target device (-d), using ${TARGET_DEVICE}"
fi
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_resource_cache_mb_limit=24"
arm)
DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0"
ANDROID_ARCH="arm"
;;
nexus_4 | nexus_7 | nexus_10)
arm_v7 | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10 | xoom)
DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=1"
ANDROID_ARCH="arm"
;;
arm_v7_neon)
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_resource_cache_mb_limit=32"
ANDROID_ARCH="arm"
;;
intel_rhb | razr_i)
DEFINES="${DEFINES} skia_arch_type=x86"
DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
ANDROID_ARCH="x86"
arm64 | nexus_9)
DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
ANDROID_ARCH="arm64"
;;
x86)
DEFINES="${DEFINES} skia_arch_type=x86"
@ -128,26 +127,6 @@ setup_device() {
DEFINES="${DEFINES} skia_arch_type=x86_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"
;;
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"
;;
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"
;;
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"