Stop using frankenstein ndk

readdle · Sep 10, 2019 · 1aa2046 · 1aa2046
1 parent 5f7932c
commit 1aa2046
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/build/Linux/040-build-foundation-depends.sh b/build/Linux/040-build-foundation-depends.sh
@@ -17,7 +17,7 @@ mkdir -p $STANDALONE_TOOLCHAIN
 
 for arch in ${archs[*]}
 do
-    $ANDROID_NDK17_ORIGINAL/build/tools/make_standalone_toolchain.py --api 21 --arch $arch --stl libc++ --install-dir $STANDALONE_TOOLCHAIN/$arch --force -v
+    $ANDROID_NDK17/build/tools/make_standalone_toolchain.py --api 21 --arch $arch --stl libc++ --install-dir $STANDALONE_TOOLCHAIN/$arch --force -v
 done
 
 pushd $STANDALONE_TOOLCHAIN

diff --git a/build/Linux/060-collect.sh b/build/Linux/060-collect.sh
@@ -20,7 +20,7 @@ do
     sysroot=$STANDALONE_TOOLCHAIN/$arch/sysroot
     icu_libs=$ICU_LIBS/$abi
 
-    rsync -av $ANDROID_NDK17_ORIGINAL/sources/cxx-stl/llvm-libc++/libs/$abi/libc++_shared.so $dst_libs
+    rsync -av $ANDROID_NDK17/sources/cxx-stl/llvm-libc++/libs/$abi/libc++_shared.so $dst_libs
     rsync -av $icu_libs/libicu{uc,i18n,data}swift.so $dst_libs
     rsync -av $sysroot/usr/lib/libcrypto.a $dst_libs
     rsync -av $sysroot/usr/lib/libssl.a $dst_libs

diff --git a/build/Linux/common-flags-arm.cmake b/build/Linux/common-flags-arm.cmake
@@ -1,6 +1,7 @@
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
 
 set(CMAKE_SYSTEM_NAME "Android" CACHE STRING "")
+
 set(CMAKE_SYSTEM_VERSION "21" CACHE STRING "")
 set(CMAKE_ANDROID_NDK "$ENV{ANDROID_NDK}" CACHE STRING "")
 set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang" CACHE STRING "")

diff --git a/vagrant/provision/020_install_ndk.sh b/vagrant/provision/020_install_ndk.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for version in 16b 17c 20
+for version in 16b 17c
 do
     ndk=android-ndk-r$version
     ndk_zip=$ndk-linux-x86_64.zip
@@ -25,13 +25,8 @@ do
     rm $ndk_zip
 done
 
-cp -r android-ndk-r17c android-ndk-r17c-original
-cp -r android-ndk-r20/toolchains/llvm android-ndk-r17c/toolchains
-
 # exports
 echo "export ANDROID_NDK16=\$HOME/android-ndk-r16b" >> .build_env
 echo "export ANDROID_NDK17=\$HOME/android-ndk-r17c" >> .build_env
-echo "export ANDROID_NDK17_ORIGINAL=\$HOME/android-ndk-r17c-original" >> .build_env
-echo "export ANDROID_NDK20=\$HOME/android-ndk-r20" >> .build_env
 
 echo "export STANDALONE_TOOLCHAIN=\$HOME/android-standalone-toolchain" >> .build_env