diff options
| author |  Derek Sollenberger <djsollen@google.com> | 2016-12-01 14:37:41 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-02 14:11:24 +0000 |
| commit | 78b35230aaa2620f826266e3f2385bf06eb881ed (patch) | |
| tree | 28104f2dff9cf0eaa2e8987b45269f6157c6e150 /platform_tools/android/bin/adb_push_if_needed | |
| parent | 9c77ea1ea5a1fa26f10d3bf83a6250008af78049 (diff) | |
Archive or update unsupported Android scripts and third-party dependencies.
- nothing uses ashmem;
- cpufeatures and native_app_glue are now pulled from the NDK;
- no bots use the scripts in platform_tools/android/bin;
- update scripts to work with GN instead of GYP.
Change-Id: I14f47eeadb3047505e232dd10385f58ef12c73f4
Reviewed-on: https://skia-review.googlesource.com/5422
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'platform_tools/android/bin/adb_push_if_needed')
| -rwxr-xr-x | platform_tools/android/bin/adb_push_if_needed | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform_tools/android/bin/adb_push_if_needed b/platform_tools/android/bin/adb_push_if_needed index efe6bb8a1f..2f8958e027 100755 --- a/platform_tools/android/bin/adb_push_if_needed +++ b/platform_tools/android/bin/adb_push_if_needed @@ -3,8 +3,7 @@ # Copy the contents of a directory from the host to a device. SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -SKIP_TOOLCHAIN_SETUP="true" -source $SCRIPT_DIR/android_setup.sh +source $SCRIPT_DIR/utils/android_setup.sh source $SCRIPT_DIR/utils/setup_adb.sh adb_push_if_needed ${APP_ARGS[@]} |