diff options
| author |  djsollen <djsollen@google.com> | 2016-03-16 08:48:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-16 08:48:58 -0700 |
| commit | b3b6beae044ca457edf99cf223cd6379a49d4ef0 (patch) | |
| tree | 11dd0fd0c2554ff4a6fc4f40152f166f610944b5 /platform_tools | |
| parent | 2691d76a06e1af6282f8b3a3140cc93361be10c4 (diff) | |
Cleanup download scripts related to new Android NDK.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810603002
Review URL: https://codereview.chromium.org/1810603002
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_native | 3 | ||||
| -rwxr-xr-x | platform_tools/android/bin/utils/setup_toolchain.sh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_gdb_native b/platform_tools/android/bin/android_gdb_native index a6d748ca4e..bf6827a25c 100755 --- a/platform_tools/android/bin/android_gdb_native +++ b/platform_tools/android/bin/android_gdb_native @@ -45,8 +45,7 @@ GDBSETUP=$GDB_TMP_DIR/gdb.setup # Launch gdb client echo "Entering gdb client shell" -GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1) -"$GDB_COMMAND" -x $GDBSETUP +$ANDROID_TOOLCHAIN/../gdb -x $GDBSETUP # Clean up: # We could 'rm -rf $GDB_TMP_DIR', but doing so would cause subsequent debugging diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh index 93322da48f..c2c6a52209 100755 --- a/platform_tools/android/bin/utils/setup_toolchain.sh +++ b/platform_tools/android/bin/utils/setup_toolchain.sh @@ -53,13 +53,14 @@ function default_toolchain() { pushd $TOOLCHAINS curl -o $NDK.zip https://dl.google.com/android/repository/android-ndk-$NDK-$HOST-x86_64.zip unzip $NDK.zip - UNZIPPED=android-ndk-$NDK-$HOST-x86_64.tar.bz2 + UNZIPPED=android-ndk-$NDK ./$UNZIPPED/build/tools/make-standalone-toolchain.sh \ --use-llvm \ --arch=$ANDROID_ARCH \ --platform=android-$API \ --install_dir=$TOOLCHAIN cp $UNZIPPED/prebuilt/android-$ANDROID_ARCH/gdbserver/gdbserver $TOOLCHAIN + cp $UNZIPPED/prebuilt/${HOST}-x86_64/bin/gdb $TOOLCHAIN rm $NDK.zip rm -rf $UNZIPPED popd |