diff options
author | Dan Albert <danalbert@google.com> | 2015-08-25 21:42:30 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2015-08-27 14:42:00 -0700 |
commit | 923d15e087ff9f725f694d9e378978843653148a (patch) | |
tree | efb9891727932c35bfae088e95341a00eb7453ee | |
parent | b4faed96bad6f06145a0317259778c80f6b23aef (diff) | |
download | toolchain_gcc-923d15e087ff9f725f694d9e378978843653148a.tar.gz toolchain_gcc-923d15e087ff9f725f694d9e378978843653148a.tar.bz2 toolchain_gcc-923d15e087ff9f725f694d9e378978843653148a.zip |
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)
-rwxr-xr-x | build-gcc.sh | 2 | ||||
-rwxr-xr-x | build.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build-gcc.sh b/build-gcc.sh index 56b783109..1768a0131 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>" @@ -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 |