Move ndk-common.sh to build/tools/

It doesn't make sense to put it under build/core/ anymore.

Change-Id: I3a63ecabd15d4c34c2ba3800b95246f5eeb6a6f3

9 files changed, 12 insertions, 12 deletions

diff --git a/build/tools/build-ndk-sysroot.sh b/build/tools/build-ndk-sysroot.sh
index bdfce1401..13acda0a8 100755
--- a/build/tools/build-ndk-sysroot.sh
+++ b/build/tools/build-ndk-sysroot.sh
@@ -28,7 +28,7 @@
 # WARNING: For now, only a single target ABI/Architecture us supported
 #
 
-. `dirname $0`/../core/ndk-common.sh
+. `dirname $0`/ndk-common.sh
 
 # PLATFORM is the name of the current Android system platform
 PLATFORM=android-3
diff --git a/build/core/ndk-common.sh b/build/tools/ndk-common.sh
index b1ed9793b..f8bef0e12 100644
--- a/build/core/ndk-common.sh
+++ b/build/tools/ndk-common.sh
@@ -66,7 +66,7 @@ if [ ! -d $ANDROID_NDK_ROOT ] ; then
     exit 1
 fi
 
-if [ ! -f $ANDROID_NDK_ROOT/build/core/ndk-common.sh ] ; then
+if [ ! -f $ANDROID_NDK_ROOT/build/tools/ndk-common.sh ] ; then
     echo "ERROR: Your ANDROID_NDK_ROOT variable does not point to a valid directory."
     exit 1
 fi
diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
index 97b451a9b..79c1b343c 100644
--- a/build/tools/prebuilt-common.sh
+++ b/build/tools/prebuilt-common.sh
@@ -24,7 +24,7 @@ fi
 
 NDK_BUILDTOOLS_ABSPATH=$(cd $NDK_BUILDTOOLS_PATH && pwd)
 
-. $NDK_BUILDTOOLS_PATH/../core/ndk-common.sh
+. $NDK_BUILDTOOLS_PATH/ndk-common.sh
 . $NDK_BUILDTOOLS_PATH/dev-defaults.sh
 
 #====================================================
diff --git a/ndk-gdb b/ndk-gdb
index 972f3ad19..2faa7df4c 100755
--- a/ndk-gdb
+++ b/ndk-gdb
@@ -35,7 +35,7 @@ case $PROGDIR in
         ;;
 esac
 
-. $PROGDIR/build/core/ndk-common.sh
+. $PROGDIR/build/tools/ndk-common.sh
 
 force_32bit_binaries
 
diff --git a/ndk-gdb-py b/ndk-gdb-py
index f2a4d942a..11643d450 100755
--- a/ndk-gdb-py
+++ b/ndk-gdb-py
@@ -11,7 +11,7 @@ case $PROGDIR in
         ;;
 esac
 
-. $PROGDIR/build/core/ndk-common.sh
+. $PROGDIR/build/tools/ndk-common.sh
 
 # -u means unbuffered standard io.
 $PROGDIR/prebuilt/$HOST_TAG/bin/python -u $PROGDIR/ndk-gdb.py "$@"
diff --git a/tests/check-release.sh b/tests/check-release.sh
index cdf6f684e..32d0dc6ee 100755
--- a/tests/check-release.sh
+++ b/tests/check-release.sh
@@ -20,7 +20,7 @@
 PROGNAME=$(basename "$0")
 PROGDIR=$(dirname "$0")
 
-. "$PROGDIR"/../build/core/ndk-common.sh
+. "$PROGDIR"/../build/tools/ndk-common.sh
 
 panic () {
     echo "ERROR: $@" >&2
diff --git a/tests/run-tests-all.sh b/tests/run-tests-all.sh
index e2fcbed62..ed78365d8 100755
--- a/tests/run-tests-all.sh
+++ b/tests/run-tests-all.sh
@@ -3,8 +3,8 @@
 PROGDIR=`dirname $0`
 NDK=`cd $PROGDIR/.. && pwd`
 NDK_BUILDTOOLS_PATH=$NDK/build/tools
-. $NDK/build/core/ndk-common.sh
-. $NDK/build/tools/prebuilt-common.sh
+. $NDK_BUILDTOOLS_PATH/ndk-common.sh
+. $NDK_BUILDTOOLS_PATH/prebuilt-common.sh
 
 # Find all devices
 DEVICE_arm=
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 66206071d..0003fef11 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -29,8 +29,8 @@ PROGDIR=`cd $PROGDIR && pwd`
 #
 ROOTDIR=`cd $PROGDIR/.. && pwd`
 NDK_BUILDTOOLS_PATH=$ROOTDIR/build/tools
-. $ROOTDIR/build/core/ndk-common.sh
-. $ROOTDIR/build/tools/prebuilt-common.sh
+. $NDK_BUILDTOOLS_PATH/ndk-common.sh
+. $NDK_BUILDTOOLS_PATH/prebuilt-common.sh
 
 # The list of tests that are too long to be part of a normal run of
 # run-tests.sh. Most of these do not run properly at the moment.
@@ -281,7 +281,7 @@ if [ -n "$NDK_ROOT" ] ; then
         dump "Please use a valid path for this option."
         exit 1
     fi
-    if [ ! -f "$NDK_ROOT/ndk-build" -o ! -f "$NDK_ROOT/build/core/ndk-common.sh" ] ; then
+    if [ ! -f "$NDK_ROOT/ndk-build" -o ! -f "$NDK_ROOT/build/tools/prebuilt-common.sh" ] ; then
         dump "ERROR: Your --ndk option does not point to a valid NDK install: $NDK_ROOT"
         dump "Please use a valid NDK install path for this option."
         exit 3
diff --git a/tests/standalone/run.sh b/tests/standalone/run.sh
index 73e22f501..45b4867c7 100755
--- a/tests/standalone/run.sh
+++ b/tests/standalone/run.sh
@@ -31,7 +31,7 @@
 PROGNAME=$(basename "$0")
 PROGDIR=$(dirname "$0")
 NDK_ROOT=$(cd "$PROGDIR/../.." && pwd)
-. $NDK_ROOT/build/core/ndk-common.sh
+. $NDK_ROOT/build/tools/ndk-common.sh
 
 panic () {
     echo "ERROR: $@" >&2; exit 1