| 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..d7d75f9067dc25987950fbabd27d00fedc91869c 100755
|
| --- a/platform_tools/android/bin/android_setup.sh
|
| +++ b/platform_tools/android/bin/android_setup.sh
|
| @@ -146,9 +146,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)
|
|
|