ndk/build/tools: fix improper mktemp usage

Change-Id: I592b025ebdf2181a80f5c7014fb40d3cdcd8e2ca

diff --git a/build/tools/build-ccache.sh b/build/tools/build-ccache.sh
index 51fe5e5..b06e0a3 100755 (executable)
--- a/build/tools/build-ccache.sh
+++ b/build/tools/build-ccache.sh
@@ -38,7 +38,7 @@ CCACHE_URL=$DOWNLOAD_ROOT/$CCACHE_PACKAGE
 
 OPTION_PACKAGE=no
 
-BUILD_OUT=`mktemp -d /tmp/ndk-toolchain-XXX`
+BUILD_OUT=`random_temp_directory`
 OPTION_BUILD_OUT=
 OPTION_FROM=
 

diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh
index 2ac0d2e..689d876 100755 (executable)
--- a/build/tools/build-gcc.sh
+++ b/build/tools/build-gcc.sh
@@ -32,7 +32,7 @@ the toolchain to use (e.g. arm-eabi-4.4.0)."
 
 JOBS=$HOST_NUM_CPUS
 RELEASE=`date +%Y%m%d`
-BUILD_OUT=`mktemp -d /tmp/ndk-toolchain-XXX`
+BUILD_OUT=`random_temp_directory`
 PLATFORM=android-3
 GDB_VERSION=6.6
 BINUTILS_VERSION=2.19

diff --git a/build/tools/build-gdbserver.sh b/build/tools/build-gdbserver.sh
index 2bfc7b2..85eca23 100755 (executable)
--- a/build/tools/build-gdbserver.sh
+++ b/build/tools/build-gdbserver.sh
@@ -33,7 +33,7 @@ is the name of the toolchain to use (e.g. arm-eabi-4.4.0).
 NOTE: The --platform option is ignored if --sysroot is used."
 
 RELEASE=`date +%Y%m%d`
-BUILD_OUT=`mktemp -d /tmp/ndk-toolchain-XXX`
+BUILD_OUT=`random_temp_directory`
 PLATFORM=android-3
 VERBOSE=no
 JOBS=$HOST_NUM_CPUS

diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
index 44a518e..cd53e4e 100644 (file)
--- a/build/tools/prebuilt-common.sh
+++ b/build/tools/prebuilt-common.sh
@@ -424,3 +424,8 @@ check_toolchain_install ()
     set_toolchain_install $TOOLCHAIN_PATH
 }
 
+
+random_temp_directory ()
+{
+    mktemp -d /tmp/ndk-toolchain-XXXXXX
+}

diff --git a/build/tools/rebuild-all-prebuilt.sh b/build/tools/rebuild-all-prebuilt.sh
index 22a1334..46d780d 100755 (executable)
--- a/build/tools/rebuild-all-prebuilt.sh
+++ b/build/tools/rebuild-all-prebuilt.sh
@@ -36,7 +36,7 @@ NDK_DIR=$ANDROID_NDK_ROOT
 register_option "--ndk-dir=<path>" do_ndk_dir "Specify target NDK directory" "$NDK_DIR"
 do_ndk_dir () { OPTION_NDK_DIR=$1; }
 
-BUILD_DIR=`mktemp -d /tmp/ndk-prebuilt-XXX`
+BUILD_DIR=`random_temp_directory`
 OPTION_BUILD_DIR=
 register_option "--build-dir=<path>" do_build_dir "Specify temporary build directory" "/tmp/<random>"
 do_build_dir () { OPTION_BUILD_DIR=$1; }

diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT
index dc46b6c..b0b8717 100644 (file)
--- a/docs/CHANGES.TXT
+++ b/docs/CHANGES.TXT
@@ -1,6 +1,17 @@
 Android NDK ChangeLog:
 
 -------------------------------------------------------------------------------
+android-ndk-r4b
+
+This release fixes a few bugs in r4 scripts. There are no new features.
+
+OTHER FIXES & CHANGES:
+
+- build/tools/rebuild-all-prebuilt.sh: mktemp expects 'XXXXXX' instead of 'XXX'.
+  Fix the script (and others in the same directory) to do that properly.
+
+
+-------------------------------------------------------------------------------
 android-ndk-r4
 
 IMPORTANT BUG FIXES: