Revert update to NDK 26b for Swift build

finagolfin · Nov 2, 2023 · 632362d · 632362d
1 parent 91dee0f
commit 632362d
Show file tree

Hide file tree

Showing 27 changed files with 62 additions and 549 deletions.
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -159,7 +159,9 @@ jobs:
               firefox google-chrome-stable microsoft-edge-stable mono-runtime-common monodoc-manual ruby
             sudo apt autoremove -yq
             sudo rm -fr /opt/hostedtoolcache /usr/share/dotnet /usr/share/swift
-            NDK=$ANDROID_NDK_LATEST_HOME ANDROID_HOME=$ANDROID_SDK_ROOT ./build-package.sh -I -a ${{ matrix.target_arch }} $packages
+            NDK=$ANDROID_NDK_ROOT ANDROID_HOME=$ANDROID_SDK_ROOT ./build-package.sh -I -a ${{ matrix.target_arch }} ndk-multilib
+            mv ~/.termux-build/ndk-multilib/massage/data/data/com.termux/files/usr/opt /data/data/com.termux/files/usr
+            NDK=$ANDROID_NDK_ROOT ANDROID_HOME=$ANDROID_SDK_ROOT ./build-package.sh -I -a ${{ matrix.target_arch }} $packages
           else
             ./scripts/run-docker.sh ./build-package.sh -I -a ${{ matrix.target_arch }} $packages
           fi

diff --git a/build-package.sh b/build-package.sh
@@ -228,9 +228,9 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_handle_hostbuild.sh"
 # shellcheck source=scripts/build/termux_step_host_build.sh
 source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_host_build.sh"
 
-# Setup a standalone Android NDK toolchain. Called from termux_step_setup_toolchain.
-# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_26b.sh
-source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_26b.sh"
+# Setup a standalone Android NDK 25c toolchain. Called from termux_step_setup_toolchain.
+# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_25c.sh
+source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_25c.sh"
 
 # Setup a standalone Android NDK 23c toolchain. Called from termux_step_setup_toolchain.
 # shellcheck source=scripts/build/toolchain/termux_setup_toolchain_23c.sh

diff --git a/ndk-patches/25c b/ndk-patches/25c
@@ -0,0 +1 @@
+23c
diff --git a/ndk-patches/26b/bits-struct_file.h.patch b/ndk-patches/26b/bits-struct_file.h.patch
diff --git a/ndk-patches/26b/dirent.h.patch b/ndk-patches/26b/dirent.h.patch
diff --git a/ndk-patches/26b/grp.h.patch b/ndk-patches/26b/grp.h.patch
diff --git a/ndk-patches/26b/linux-fcntl.h.patch b/ndk-patches/26b/linux-fcntl.h.patch
diff --git a/ndk-patches/26b/paths.h.patch b/ndk-patches/26b/paths.h.patch
diff --git a/ndk-patches/26b/pwd.h.patch b/ndk-patches/26b/pwd.h.patch
diff --git a/ndk-patches/26b/redefine-TCSAFLUSH.patch b/ndk-patches/26b/redefine-TCSAFLUSH.patch
diff --git a/ndk-patches/26b/semaphore.h.patch b/ndk-patches/26b/semaphore.h.patch
diff --git a/ndk-patches/26b/stdio.h.patch b/ndk-patches/26b/stdio.h.patch