From c0ecd3a5979ebff83089a41270e5450b60b8a131 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 24 Apr 2020 15:23:00 -0700 Subject: 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 --- packaging/android/android-build-wrapper.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packaging/android') 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 -- cgit v1.2.3-70-g09d2