Move gdbserver out of prebuilt/.

Also stops installing gdbserver into the source directory.

Bug: http://b/25432797
Bug: http://b/25454836
Change-Id: I4af1ae19473b528f167ceff19c021c760367335e

.gitignore

@@ -7,4 +7,3 @@ build.xml
 /host-tools/
 /ndk-stack*
 /ndk-depends*
-/prebuilt/

build/tools/build-gdbserver.sh

@@ -227,7 +227,8 @@ else
     DSTFILE="gdbserver"
 fi
 dump "Install  : $TOOLCHAIN $DSTFILE."
-DEST=$ANDROID_NDK_ROOT/prebuilt/android-$ARCH/gdbserver
+INSTALL_DIR=`mktemp -d`
+DEST=$INSTALL_DIR/gdbserver/$ARCH
 mkdir -p $DEST &&
 run $TOOLCHAIN_PREFIX-objcopy --strip-unneeded $BUILD_OUT/gdbserver $DEST/$DSTFILE
 if [ $? != 0 ] ; then
@@ -237,10 +238,10 @@ fi
 
 if [ "$PACKAGE_DIR" ]; then
     ARCHIVE=gdbserver-$ARCH.tar.bz2
-    GDBSERVER_SUBDIR="prebuilt/android-$ARCH/gdbserver"
-    make_repo_prop "$ANDROID_NDK_ROOT/$GDBSERVER_SUBDIR"
+    GDBSERVER_SUBDIR="gdbserver/$ARCH"
+    make_repo_prop "$INSTALL_DIR/$GDBSERVER_SUBDIR"
     dump "Packaging: $ARCHIVE"
-    pack_archive "$PACKAGE_DIR/$ARCHIVE" "$ANDROID_NDK_ROOT" "$GDBSERVER_SUBDIR"
+    pack_archive "$PACKAGE_DIR/$ARCHIVE" "$INSTALL_DIR" "$GDBSERVER_SUBDIR"
 fi
 
 log "Cleaning up."

ndk-gdb.py

@@ -421,7 +421,7 @@ def get_gdbserver_path(args, package_name, app_data_dir, arch):
 
     # We need to upload our gdbserver
     log("App gdbserver not found at {}, uploading.".format(app_gdbserver_path))
-    local_path = "{}/prebuilt/android-{}/gdbserver/gdbserver"
+    local_path = "{}/gdbserver/{}/gdbserver"
     local_path = local_path.format(NDK_PATH, arch)
     remote_path = "/data/local/tmp/{}-gdbserver".format(arch)
     args.device.push(local_path, remote_path)