Cleanup download scripts related to new Android NDK.

platform_tools/android/bin/utils/setup_toolchain.sh

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 #!/bin/bash
 #
 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts.
 
 # Fail-fast if anything in the script fails.
@@ skipping 35 matching lines @@
   TOOLCHAIN=$ANDROID_ARCH-$NDK-$API
   HOST=`uname | tr '[A-Z]' '[a-z]'`
 
   exportVar ANDROID_TOOLCHAIN "${TOOLCHAINS}/${TOOLCHAIN}/bin"
 
   if [ ! -d "$ANDROID_TOOLCHAIN" ]; then
     mkdir -p $TOOLCHAINS
     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
   fi
 
   verbose "Targeting NDK API $API (NDK Revision $NDK)"
 }
 
 #check to see if the toolchain has been defined and if not setup the default toolchain
 if [ -z "$ANDROID_TOOLCHAIN" ]; then
@@ skipping 69 matching lines @@
 # Create symlinks for nm & readelf and add them to the path so that the ninja
 # build uses them instead of attempting to use the one on the system.
 # This is required to build using ninja on a Mac.
 if [ $(uname) == "Darwin" ]; then
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as
 fi
 
 exportVar PATH $ANDROID_TOOLCHAIN:$PATH