diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh index 7a00927f9..eddaf4d32 100755 --- a/project/jni/application/setEnvironment-arm64-v8a.sh +++ b/project/jni/application/setEnvironment-arm64-v8a.sh @@ -100,6 +100,7 @@ LDFLAGS=" -Qunused-arguments -Wl,-z,relro -Wl,-z,now +-Wl,--no-rosegment $SHARED $APP_SHARED_LIBS -landroid @@ -120,11 +121,11 @@ CXXFLAGS="$CXXFLAGS $CFLAGS -frtti -fexceptions" \ LDFLAGS="$LDFLAGS" \ CC="$CC" \ CXX="$CXX" \ -RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \ +RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ranlib" \ LD="$CXX" \ -AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \ +AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ar" \ CPP="$CPP" \ -NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \ -AS="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \ -STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \ +NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-nm" \ +AS="$CC" \ +STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip" \ "$@" diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh index 6a206f45c..b7ec2c310 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -106,6 +106,7 @@ LDFLAGS=" -Qunused-arguments -Wl,-z,relro -Wl,-z,now +-Wl,--no-rosegment $SHARED $APP_SHARED_LIBS -landroid @@ -127,11 +128,11 @@ CXXFLAGS="$CXXFLAGS $CFLAGS -frtti -fexceptions" \ LDFLAGS="$LDFLAGS" \ CC="$CC" \ CXX="$CXX" \ -RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$BINUTILSPREFIX-ranlib" \ +RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ranlib" \ LD="$CXX" \ -AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$BINUTILSPREFIX-ar" \ +AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ar" \ CPP="$CPP" \ -NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$BINUTILSPREFIX-nm" \ -AS="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$BINUTILSPREFIX-as" \ -STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$BINUTILSPREFIX-strip" \ +NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-nm" \ +AS="$CC" \ +STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip" \ "$@" diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh index 113ab52db..1a293d464 100755 --- a/project/jni/application/setEnvironment-x86.sh +++ b/project/jni/application/setEnvironment-x86.sh @@ -103,6 +103,7 @@ LDFLAGS=" -Qunused-arguments -Wl,-z,relro -Wl,-z,now +-Wl,--no-rosegment $SHARED $APP_SHARED_LIBS -landroid @@ -123,11 +124,11 @@ CXXFLAGS="$CXXFLAGS $CFLAGS -frtti -fexceptions" \ LDFLAGS="$LDFLAGS" \ CC="$CC" \ CXX="$CXX" \ -RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \ +RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ranlib" \ LD="$CXX" \ -AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \ +AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ar" \ CPP="$CPP" \ -NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \ -AS="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \ -STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \ +NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-nm" \ +AS="$CC" \ +STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip" \ "$@" diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh index 593913f05..0f613c5e7 100755 --- a/project/jni/application/setEnvironment-x86_64.sh +++ b/project/jni/application/setEnvironment-x86_64.sh @@ -103,6 +103,7 @@ LDFLAGS=" -Qunused-arguments -Wl,-z,relro -Wl,-z,now +-Wl,--no-rosegment $SHARED $APP_SHARED_LIBS -landroid @@ -123,11 +124,11 @@ CXXFLAGS="$CXXFLAGS $CFLAGS -frtti -fexceptions" \ LDFLAGS="$LDFLAGS" \ CC="$CC" \ CXX="$CXX" \ -RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \ +RANLIB="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ranlib" \ LD="$CXX" \ -AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \ +AR="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-ar" \ CPP="$CPP" \ -NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \ -AS="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \ -STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \ +NM="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-nm" \ +AS="$CC" \ +STRIP="$NDK/toolchains/llvm/prebuilt/$MYARCH/bin/llvm-strip" \ "$@"