diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 18:31:09 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 18:31:09 +0000 |
| commit | 105775b82341d7c86986b3fb03698d4e471bc3ab (patch) | |
| tree | c9964c11579d956d90b97e2a8d75e3b7cf8e11fe /platform_tools | |
| parent | c1dc0d486ff1f537378205a2d1698ce2044e7735 (diff) | |
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
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_make | 3 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make index 572f4a1331..9601db9b17 100755 --- a/platform_tools/android/bin/android_make +++ b/platform_tools/android/bin/android_make @@ -11,7 +11,8 @@ rm -f .android_config SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}") source $SCRIPT_DIR/android_setup.sh -GYP_GENERATORS=ninja-android ./gyp_skia +SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd) +GYP_GENERATORS=ninja-android "${SKIA_SRC_DIR}/gyp_skia" ninja -C $SKIA_OUT/$BUILDTYPE ${APP_ARGS[@]} # Write the device id into the .android_config file. This tells 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) |