Use the build scripts from ndk/.

Using the build scripts from prebuilts/ndk makes the edit/compile
cycle complicated since we have to either edit in ndk/ and copy to
prebuilts/ or vice versa.

The prebuilt NDK build scripts should really just be whatever build
scripts we end up shipping with the modular NDK (i.e. anything that
supports ndk-build or the tests rather than things used to build the
NDK itself).

Change-Id: Id995397d6272f1539037a19287cc8a69fdb4b8a1
(cherry picked from commit 79ee432e58c7b1a4ae92aa2886ecd96173acbdf6)

2 files changed, 2 insertions, 2 deletions

diff --git a/build-gcc.sh b/build-gcc.sh
index 56b7831..1768a01 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -19,7 +19,7 @@
 #
 
 # include common function and variable definitions
-. $ANDROID_NDK_ROOT/build/tools/prebuilt-common.sh
+. $NDK_BUILDTOOLS_PATH/prebuilt-common.sh
 
 PROGRAM_PARAMETERS="<src-dir> <ndk-dir> <toolchain>"
 
diff --git a/build.py b/build.py
index 769a370..4cff80a 100755
--- a/build.py
+++ b/build.py
@@ -116,7 +116,7 @@ def main():
     if host is None:
         host = get_default_host()
 
-    ndk_build_tools_path = android_path('prebuilts/ndk/current/build/tools')
+    ndk_build_tools_path = android_path('ndk/build/tools')
     build_env = dict(os.environ)
     build_env['NDK_BUILDTOOLS_PATH'] = ndk_build_tools_path
     build_env['ANDROID_NDK_ROOT'] = ndk_path