summaryrefslogtreecommitdiffstats
path: root/packaging/android
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-04-24 15:23:00 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-04-25 13:18:41 -0700
commitc0ecd3a5979ebff83089a41270e5450b60b8a131 (patch)
tree3cde7d0bcf37c96d5a5602dc5d9af371319769ef /packaging/android
parent9025a9b2b14f213e7e5de33a2ff8a5addf433ef9 (diff)
downloadsubsurface-c0ecd3a5979ebff83089a41270e5450b60b8a131.tar.gz
build-system/Android: create standalone toolchain in wrapper script
This way when we build the android build container, the correct toolchain is already in place. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android')
-rwxr-xr-xpackaging/android/android-build-wrapper.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh
index d74b025ac..a361d8e41 100755
--- a/packaging/android/android-build-wrapper.sh
+++ b/packaging/android/android-build-wrapper.sh
@@ -87,6 +87,11 @@ if [ ! -d "$ANDROID_NDK" ] ; then
unzip -q "$NDK_BINARIES"
fi
+if [ ! -e ndk-"$ARCH" ] ; then
+ "$ANDROID_NDK/build/tools/make_standalone_toolchain.py" --arch=arm --install-dir=ndk-arm --api=$ANDROID_PLATFORM_LEVEL
+ "$ANDROID_NDK/build/tools/make_standalone_toolchain.py" --arch=arm64 --install-dir=ndk-arm64 --api=$ANDROID_PLATFORM_LEVEL
+fi
+
if [ ! -d "$ANDROID_SDK"/build-tools/"${ANDROID_BUILDTOOLS_REVISION}" ] ||
[ ! -d "$ANDROID_SDK"/platforms/"${ANDROID_PLATFORMS}" ] ||
[ ! -d "$ANDROID_SDK"/platforms/"${ANDROID_PLATFORM}" ] ; then