From 0502bd9416aa971cd24ba3b89dd756d056ea328d Mon Sep 17 00:00:00 2001 From: pelya Date: Thu, 31 Dec 2020 22:13:50 +0200 Subject: [PATCH] SDL: update to NDK r22 - switch from GNU binutils strip to llvm-strip --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index bc9e13781..26aeea339 100755 --- a/build.sh +++ b/build.sh @@ -117,28 +117,28 @@ strip_libs() { rm obj/local/armeabi-v7a/libapplication.so && \ cp jni/application/src/libapplication-armeabi-v7a.so obj/local/armeabi-v7a/libapplication.so && \ cp jni/application/src/libapplication-armeabi-v7a.so libs/armeabi-v7a/libapplication.so && \ - `which ndk-build | sed 's@/ndk-build@@'`/toolchains/arm-linux-androideabi-${NDK_TOOLCHAIN_VERSION}/prebuilt/$MYARCH/bin/arm-linux-androideabi-strip --strip-unneeded libs/armeabi-v7a/libapplication.so + `which ndk-build | sed 's@/ndk-build@@'`/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip --strip-unneeded libs/armeabi-v7a/libapplication.so grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \ grep "MultiABI=" ../AndroidAppSettings.cfg | grep "all\\|x86" > /dev/null && \ echo Stripping libapplication-x86.so by hand && \ rm obj/local/x86/libapplication.so && \ cp jni/application/src/libapplication-x86.so obj/local/x86/libapplication.so && \ cp jni/application/src/libapplication-x86.so libs/x86/libapplication.so && \ - `which ndk-build | sed 's@/ndk-build@@'`/toolchains/x86-${NDK_TOOLCHAIN_VERSION}/prebuilt/$MYARCH/bin/i686-linux-android-strip --strip-unneeded libs/x86/libapplication.so + `which ndk-build | sed 's@/ndk-build@@'`/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip --strip-unneeded libs/x86/libapplication.so grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \ grep "MultiABI=" ../AndroidAppSettings.cfg | grep "all\\|x86_64" > /dev/null && \ echo Stripping libapplication-x86_64.so by hand && \ rm obj/local/x86_64/libapplication.so && \ cp jni/application/src/libapplication-x86_64.so obj/local/x86_64/libapplication.so && \ cp jni/application/src/libapplication-x86_64.so libs/x86_64/libapplication.so && \ - `which ndk-build | sed 's@/ndk-build@@'`/toolchains/x86_64-${NDK_TOOLCHAIN_VERSION}/prebuilt/$MYARCH/bin/x86_64-linux-android-strip --strip-unneeded libs/x86_64/libapplication.so + `which ndk-build | sed 's@/ndk-build@@'`/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip --strip-unneeded libs/x86_64/libapplication.so grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \ grep "MultiABI=" ../AndroidAppSettings.cfg | grep "all\\|arm64-v8a" > /dev/null && \ echo Stripping libapplication-arm64-v8a.so by hand && \ rm obj/local/arm64-v8a/libapplication.so && \ cp jni/application/src/libapplication-arm64-v8a.so obj/local/arm64-v8a/libapplication.so && \ cp jni/application/src/libapplication-arm64-v8a.so libs/arm64-v8a/libapplication.so && \ - `which ndk-build | sed 's@/ndk-build@@'`/toolchains/aarch64-linux-android-${NDK_TOOLCHAIN_VERSION}/prebuilt/$MYARCH/bin/aarch64-linux-android-strip --strip-unneeded libs/arm64-v8a/libapplication.so + `which ndk-build | sed 's@/ndk-build@@'`/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip --strip-unneeded libs/arm64-v8a/libapplication.so return 0 }