From e3916bfe0e0a030d31c181ea8c9c91cae8229d22 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 1 May 2014 12:56:19 +0000 Subject: 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 --- platform_tools/android/bin/android_setup.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'platform_tools') 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 -- cgit v1.2.3