From 105775b82341d7c86986b3fb03698d4e471bc3ab Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 6 May 2014 18:31:09 +0000 Subject: Run Android make script from any directory R=djsollen@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/260743003 git-svn-id: http://skia.googlecode.com/svn/trunk@14594 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/bin/android_setup.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '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 5e1992957b..9ca8454ab5 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -155,9 +155,11 @@ setup_device() { source $SCRIPT_DIR/utils/setup_toolchain.sh DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" - exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" - exportVar SKIA_OUT "${SKIA_OUT:-out/config/android-${TARGET_DEVICE}}" + + SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd) + DEFAULT_SKIA_OUT="${SKIA_SRC_DIR}/out/config/android-${TARGET_DEVICE}" + exportVar SKIA_OUT "${SKIA_OUT:-${DEFAULT_SKIA_OUT}}" } # adb_pull_if_needed(android_src, host_dst) -- cgit v1.2.3