diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-01 12:56:19 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-01 12:56:19 +0000 |
| commit | e3916bfe0e0a030d31c181ea8c9c91cae8229d22 (patch) | |
| tree | 7a2d8d257de82c6c06941b3edf7def2f4d7a40bb /platform_tools | |
| parent | 3dbcb10e75ee6de7cfb68915dfef2da29ec3c33d (diff) | |
| download | android_external_skia-e3916bfe0e0a030d31c181ea8c9c91cae8229d22.tar.gz android_external_skia-e3916bfe0e0a030d31c181ea8c9c91cae8229d22.tar.bz2 android_external_skia-e3916bfe0e0a030d31c181ea8c9c91cae8229d22.zip | |
Support unknown Android target devices via environment variables.
This is useful for working with prototypes and uncommon devices.
NOTRY=true
R=djsollen@google.com, scroggo@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/263673004
git-svn-id: http://skia.googlecode.com/svn/trunk@14495 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 38e047cc1f..5e1992957b 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -134,8 +134,17 @@ setup_device() { ANDROID_ARCH="mips" ;; *) - echo "ERROR: unknown device $TARGET_DEVICE" - exit 1 + if [ -z "$ANDROID_IGNORE_UNKNOWN_DEVICE" ]; then + echo "ERROR: unknown device $TARGET_DEVICE" + exit 1 + fi + # If ANDROID_IGNORE_UNKNOWN_DEVICE is set, then ANDROID_TOOLCHAIN + # or ANDROID_ARCH should be set; Otherwise, ANDROID_ARCH + # defaults to 'arm' and the default ARM toolchain is used. + DEFINES="${DEFINES} skia_arch_type=${ANDROID_ARCH-arm}" + # If ANDROID_IGNORE_UNKNOWN_DEVICE is set, extra gyp defines can be + # added via ANDROID_GYP_DEFINES + DEFINES="${DEFINES} ${ANDROID_GYP_DEFINES}" ;; esac |