android scripts respect SKIA_OUT, if already set.

R=scroggo@google.com, djsollen@google.com, mtklein@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/250303002

git-svn-id: http://skia.googlecode.com/svn/trunk@14350 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index 9018de1..6438b44 100755 (executable)
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -148,7 +148,7 @@ setup_device() {
   DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
 
   exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES"
-  exportVar SKIA_OUT "out/config/android-${TARGET_DEVICE}"
+  exportVar SKIA_OUT "${SKIA_OUT:-out/config/android-${TARGET_DEVICE}}"
 }
 
 # adb_pull_if_needed(android_src, host_dst)