jzy/zerotier-magisk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use libc++_shared.so from ndk

Browse Source
This commit is contained in:
eventlOwOp
2024-05-11 13:16:47 +08:00
parent 0b63ed2a45
commit bbf54bb90e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+6 -4
View File
@@ -45,6 +45,7 @@ jobs:
- name: Build for aarch64 - name: Build for aarch64
run: | run: |
PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
CC=aarch64-linux-android$api_version-clang CC=aarch64-linux-android$api_version-clang
CXX=aarch64-linux-android$api_version-clang++ CXX=aarch64-linux-android$api_version-clang++
@@ -55,8 +56,8 @@ jobs:
cd .. cd ..
mkdir -p magisk/zerotier/lib mkdir -p magisk/zerotier/lib
mv ZeroTierOne/zerotier-one magisk/zerotier cp ZeroTierOne/zerotier-one magisk/zerotier
mv deps/aarch64/lic++_shared.so magisk/zerotier/lib cp $NDK_ROOT/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so magisk/zerotier/lib
cd magisk cd magisk
zip -q -r ../zerotier-magisk-aarch64.zip . zip -q -r ../zerotier-magisk-aarch64.zip .
@@ -65,6 +66,7 @@ jobs:
- name: Build for arm - name: Build for arm
run: | run: |
PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
CC=armv7a-linux-androideabi$api_version-clang CC=armv7a-linux-androideabi$api_version-clang
CXX=armv7a-linux-androideabi$api_version-clang++ CXX=armv7a-linux-androideabi$api_version-clang++
@@ -73,8 +75,8 @@ jobs:
make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../deps/arm" DEFS="-I../deps/include -D__GLIBC__=0" make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../deps/arm" DEFS="-I../deps/include -D__GLIBC__=0"
cd .. cd ..
mv ZeroTierOne/zerotier-one magisk/zerotier/ cp ZeroTierOne/zerotier-one magisk/zerotier/
mv deps/arm/lic++_shared.so magisk/zerotier/lib/ cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib
cd magisk cd magisk
zip -q -r ../zerotier-magisk-arm.zip . zip -q -r ../zerotier-magisk-arm.zip .
deps/aarch64/libc++_shared.so
Vendored
BIN
View File
Binary file not shown.
deps/arm/libc++_shared.so
Vendored
BIN
View File
Binary file not shown.