From 9d94bf970351a43130abb9260732af393a9405ea Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 22 Jun 2022 19:16:14 +0800 Subject: [PATCH] magisk: 25.1 --- metadata/com.topjohnwu.magisk.yml | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/metadata/com.topjohnwu.magisk.yml b/metadata/com.topjohnwu.magisk.yml index 293de8e41d..b204a846ac 100644 --- a/metadata/com.topjohnwu.magisk.yml +++ b/metadata/com.topjohnwu.magisk.yml @@ -328,6 +328,61 @@ Builds: - python3.9 ./build.py -rv app ndk: r24 + - versionName: '25.1' + versionCode: 25100 + commit: bb64ba0ef6a9bdbfcb1a2ceb4e4900f94b0deb95 + submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y g++ + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java + - pushd build/srclib/cpython + - ./configure + - make -j$(nproc) + - make altinstall + - popd + output: app/build/outputs/apk/release/app-release-unsigned.apk + srclibs: + - cpython@v3.9.10 + - vboot@release-R91-13904.B + prebuild: + - echo -e 'version=$$VERSION$$' > ./config.prop + - sed -i -e '/buildTypes/,+11d' -e 's/ndkPath.*/ndkPath = "${System.getenv("ANDROID_NDK_HOME")}"/' + -e '/val privateKey/d' -e '/val signingOptions/,/build()/d' -e '/SigningExtension/d' + -e '/signConfig/s/SigningConfig/SigningConfig?/' buildSrc/src/main/java/Setup.kt + - sed -i -e '/android.ndkPath/d' -e '/ndk.dir/d' ./local.properties + - sed -i -e "s/op.join(ndk_root, 'magisk')/os.environ['ANDROID_NDK_HOME']/" + -e '/Unmatched NDK/s/error/print/' ./build.py + - sed -i -e '/Key.CHECK_UPDATES/s/true/false/' ./app/src/main/java/com/topjohnwu/magisk/core/Config.kt + scanignore: + - app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java + scandelete: + - native/jni/external + - tools + build: + - cp -r $$NDK$$ ./NDK + - curl -Lo r10e.zip https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip + - echo "ee5f405f3b57c4f5c3b3b8b5d495ae12b660e03d2112e4ed5c728d349f1e520c r10e.zip" + | sha256sum -c - + - unzip -q r10e.zip + - cp android-ndk-r10e/platforms/android-21/arch-arm64/usr/lib/*.[ao] NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 + - cp android-ndk-r10e/platforms/android-19/arch-arm/usr/lib/*.[ao] NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21 + - cp android-ndk-r10e/platforms/android-21/arch-x86_64/usr/lib64/*.[ao] NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21 + - cp android-ndk-r10e/platforms/android-19/arch-x86/usr/lib/*.[ao] NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21 + - rm -rf android-ndk-r10e r10e.zip + - pushd $$vboot$$ + - make ARCH=arm futil + - popd + - cp $$vboot$$/build/futility/futility tools + - ln -s $(which gradle) ./gradlew + - export ANDROID_NDK_HOME=$(pwd)/NDK + - mkdir out + - curl -Lo out/stub-release.apk https://f-droid.org/archive/com.topjohnwu.magisk_2.apk + - python3.9 ./build.py -rv binary + - python3.9 ./build.py -rv app + ndk: r24 + MaintainerNotes: |- 22.1: https://github.com/topjohnwu/ndk-busybox/commit/31b2b5780bf9fe982e1f3d9df0bd4b1b44d6e394 in submodule is removed for some unkonwn reasons. Re-add it to fix the multiple definition error.