diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-24 15:16:32 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-24 15:16:32 +0000 |
| commit | e20f7cf99500eefac86d13ce14fa3baa731070ce (patch) | |
| tree | 5fcba68a5d48241be3ec71c5834278b4706fa14b /platform_tools | |
| parent | 94e2872d48b83e584b211ddc70bf6492aef93d7f (diff) | |
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
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 9018de1acf..6438b44aed 100755 --- 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) |