Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Unified Diff: platform_tools/android/bin/android_setup.sh

Issue 263673004: Support unknown Android target devices via environment variables. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index 38e047cc1f4c982961a01a8e3379d85b4113bc5d..5e1992957bb770ba463f19e421532500aa516805 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698