From 944007e3e1c3f5dc5350dc17696321146fa2c7ef Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 3 Jan 2023 09:25:56 +0800 Subject: [PATCH] magisk: 25.2-canary-25206 --- metadata/com.topjohnwu.magisk.yml | 76 +++++++++++++++++-------------- srclibs/ondk.yml | 2 + 2 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 srclibs/ondk.yml diff --git a/metadata/com.topjohnwu.magisk.yml b/metadata/com.topjohnwu.magisk.yml index a085276cf7..f4cdc6682d 100644 --- a/metadata/com.topjohnwu.magisk.yml +++ b/metadata/com.topjohnwu.magisk.yml @@ -44,6 +44,7 @@ Builds: - versionName: '1.0' versionCode: 2 + disable: Not used commit: bb64ba0ef6a9bdbfcb1a2ceb4e4900f94b0deb95 subdir: stub sudo: @@ -62,6 +63,22 @@ Builds: scanignore: - app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java + - versionName: '1.0' + versionCode: 3 + commit: b6d50bea2cf8149fe1fffb3589bd9d7e4fbc9e28 + subdir: stub + gradle: + - yes + rm: + - native + - tools + prebuild: + - echo -e 'version=25.2-canary-25206' > ../config.prop + - sed -i -e 's|"https://.*"|"https://f-droid.org/repo/com.topjohnwu.magisk_${Config.versionCode}.apk"|' + -e '/versionCode/s/1/$$VERCODE$$/' build.gradle.kts + scanignore: + - app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java + - versionName: '22.0' versionCode: 22000 commit: v22.0 @@ -328,61 +345,54 @@ Builds: - python3.9 ./build.py -rv app ndk: r24 - - versionName: '25.1' - versionCode: 25100 - disable: version check failed - commit: bb64ba0ef6a9bdbfcb1a2ceb4e4900f94b0deb95 + - versionName: 25.2-canary-25206 + versionCode: 25206 + disable: wait for stub + commit: b6d50bea2cf8149fe1fffb3589bd9d7e4fbc9e28 + timeout: 20000 submodules: true sudo: - 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 + - apt-get install -y g++ make pkg-config libssl-dev ninja-build clang-13 cmake + lld-13 + output: out/app-release.apk srclibs: - - cpython@v3.9.10 + - ondk@r25.2 - 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 's|https://.*download/{ndk_ver}|$$ondk$$/dist|' -e 's/urllib.request.urlopen(url)/open(url,"rb")/' + build.py + - sed -i -e 's/-12/-13/' -e 's/"src",.*/"src"]/' $$ondk$$/config-linux.toml - 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 + - native/src/external - tools build: - - cp -r $$NDK$$ ./NDK + - pushd $$ondk$$ + - ./build.sh x86_64 + - popd - 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 + - cp android-ndk-r10e/platforms/android-21/arch-arm64/usr/lib/*.[ao] tools/ndk-bins/21/aarch64 + - cp android-ndk-r10e/platforms/android-19/arch-arm/usr/lib/*.[ao] tools/ndk-bins/21/arm + - cp android-ndk-r10e/platforms/android-21/arch-x86_64/usr/lib64/*.[ao] tools/ndk-bins/21/x86_64 + - cp android-ndk-r10e/platforms/android-19/arch-x86/usr/lib/*.[ao] tools/ndk-bins/21/i686 - 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 + - curl -Lo out/stub-release.apk https://f-droid.org/archive/com.topjohnwu.magisk_3.apk + - python3 ./build.py -rv ndk + - python3 ./build.py -rv binary + - python3 ./build.py -rv app MaintainerNotes: |- 22.1: https://github.com/topjohnwu/ndk-busybox/commit/31b2b5780bf9fe982e1f3d9df0bd4b1b44d6e394 @@ -392,10 +402,6 @@ MaintainerNotes: |- from f-droid.org later when building the corresponding main apk. The stub apk needs to be added first and the main apk should be built in the next build cycle. - We currently cannot build the app due to the signing methed used by upstream. Upstream signs the apk - when they build it but we sign it on an offline server. See - https://gitlab.com/fdroid/rfp/-/issues/283#note_1195540004 - AutoUpdateMode: None UpdateCheckMode: None UpdateCheckData: https://topjohnwu.github.io/magisk-files/stable.json|"versionCode":\s"(\d+)"|.|"version":\s"([\d.]+)" diff --git a/srclibs/ondk.yml b/srclibs/ondk.yml new file mode 100644 index 0000000000..7d67780aa6 --- /dev/null +++ b/srclibs/ondk.yml @@ -0,0 +1,2 @@ +Repo: https://github.com/topjohnwu/ondk +RepoType: git