diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-13 01:24:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-13 01:24:20 +0000 |
| commit | a381d1185f3d81a5afb5008072fbd3ac4014927e (patch) | |
| tree | 58cf6c324f5f8becb1906f7a912ad3c092adf8b9 | |
| parent | 7280996205fb23e09981dcd32b2f51fb8ed60193 (diff) | |
| parent | 3c00ccbf3cd54d407e5bb461afb723941b773a88 (diff) | |
| download | ndk-a381d1185f3d81a5afb5008072fbd3ac4014927e.tar.gz | |
Merge "Stop installing NDK tools to the source directory."
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | build/tools/dev-cleanup.sh | 3 | ||||
| -rwxr-xr-x | sources/host-tools/ndk-depends/build-ndk-depends.sh | 10 | ||||
| -rwxr-xr-x | sources/host-tools/ndk-stack/build-ndk-stack.sh | 10 |
4 files changed, 14 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 5282ca9c3..937918264 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,3 @@ Thumbs.db local.properties build.xml /host-tools/ -/ndk-stack* -/ndk-depends* diff --git a/build/tools/dev-cleanup.sh b/build/tools/dev-cleanup.sh index 2db4fb464..72609850f 100755 --- a/build/tools/dev-cleanup.sh +++ b/build/tools/dev-cleanup.sh @@ -47,9 +47,6 @@ rm -rf $DIR/$GCCUNWIND_SUBDIR/libs rm -rf $DIR/$LIBCXX_SUBDIR/libs rm -rf $DIR/$SUPPORT_SUBDIR/libs -rm -f $DIR/ndk-stack* -rm -f $DIR/ndk-depends* - clean_dir () { if [ -d "$1" ] ; then diff --git a/sources/host-tools/ndk-depends/build-ndk-depends.sh b/sources/host-tools/ndk-depends/build-ndk-depends.sh index f1024834f..618cb80ed 100755 --- a/sources/host-tools/ndk-depends/build-ndk-depends.sh +++ b/sources/host-tools/ndk-depends/build-ndk-depends.sh @@ -79,7 +79,12 @@ else EXTRA_CONFIG="-target=arm-linux-androideabi" fi -OUT=$NDK_DIR/$(get_host_exec_name ndk-depends) +NAME=$(get_host_exec_name ndk-depends) +INSTALL_ROOT=$(mktemp -d $NDK_TMPDIR/ndk-depends-XXXXXX) +INSTALL_SUBDIR=host-tools/bin +INSTALL_PATH=$INSTALL_ROOT/$INSTALL_SUBDIR +OUT=$INSTALL_PATH/$NAME +mkdir $INSTALL_PATH # GNU Make if [ -z "$GNUMAKE" ]; then @@ -117,9 +122,8 @@ fi if [ "$PACKAGE_DIR" ]; then ARCHIVE=ndk-depends-$HOST_TAG.tar.bz2 - SUBDIR=$(get_host_exec_name ndk-depends $HOST_TAG) dump "Packaging: $ARCHIVE" - pack_archive "$PACKAGE_DIR/$ARCHIVE" "$NDK_DIR" "$SUBDIR" + pack_archive "$PACKAGE_DIR/$ARCHIVE" "$INSTALL_ROOT" "$INSTALL_SUBDIR" fail_panic "Could not create package: $PACKAGE_DIR/$ARCHIVE from $OUT" fi diff --git a/sources/host-tools/ndk-stack/build-ndk-stack.sh b/sources/host-tools/ndk-stack/build-ndk-stack.sh index 489836407..d0156148b 100755 --- a/sources/host-tools/ndk-stack/build-ndk-stack.sh +++ b/sources/host-tools/ndk-stack/build-ndk-stack.sh @@ -105,7 +105,12 @@ fail_panic "Can't configure $BINUTILS_SRC_DIR" run make -j$NUM_JOBS fail_panic "Can't build $BINUTILS_SRC_DIR" -OUT=$NDK_DIR/$(get_host_exec_name ndk-stack) +NAME=$(get_host_exec_name ndk-stack) +INSTALL_ROOT=$(mktemp -d $NDK_TMPDIR/ndk-stack-XXXXXX) +INSTALL_SUBDIR=host-tools/bin +INSTALL_PATH=$INSTALL_ROOT/$INSTALL_SUBDIR +OUT=$INSTALL_PATH/$NAME +mkdir $INSTALL_PATH # GNU Make if [ -z "$GNUMAKE" ]; then @@ -163,9 +168,8 @@ fi if [ "$PACKAGE_DIR" ]; then ARCHIVE=ndk-stack-$HOST_TAG.tar.bz2 - SUBDIR=$(get_host_exec_name ndk-stack $HOST_TAG) dump "Packaging: $ARCHIVE" - pack_archive "$PACKAGE_DIR/$ARCHIVE" "$NDK_DIR" "$SUBDIR" + pack_archive "$PACKAGE_DIR/$ARCHIVE" "$INSTALL_ROOT" "$INSTALL_SUBDIR" fail_panic "Could not create package: $PACKAGE_DIR/$ARCHIVE from $OUT" fi |