Support unknown Android target devices via environment variables.
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 1 May 2014 12:56:19 +0000 (12:56 +0000)
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 1 May 2014 12:56:19 +0000 (12:56 +0000)
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

index 38e047c..5e19929 100755 (executable)
@@ -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