From d6062944f157d278a71f42d6c31048d9c883d6f5 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 24 Aug 2020 06:24:44 -0700 Subject: [PATCH] Update snet extension to prevent crashes on release builds --- app/src/main/java/com/topjohnwu/magisk/core/Const.kt | 4 ++-- build.py | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Const.kt b/app/src/main/java/com/topjohnwu/magisk/core/Const.kt index d867738b3..d91df5e09 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/Const.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/Const.kt @@ -12,8 +12,8 @@ object Const { const val MAGISK_LOG = "/cache/magisk.log" // Versions - const val SNET_EXT_VER = 14 - const val SNET_REVISION = "5e28617412bdad2396eab87fa786094d8242e568" + const val SNET_EXT_VER = 15 + const val SNET_REVISION = "d494bc726e86166913a13629e3b1336728ec5d7f" const val BOOTCTL_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df" // Misc diff --git a/build.py b/build.py index 57ec927fe..4871d40d4 100755 --- a/build.py +++ b/build.py @@ -358,8 +358,9 @@ def build_stub(args): build_apk(args, 'stub') -# Bind mount snet package on top of the stub folder def build_snet(args): + if not op.exists(op.join('snet', 'src', 'main', 'java', 'com', 'topjohnwu', 'snet')): + error('snet sources have to be bind mounted on top of the stub folder') header('* Building snet extension') proc = execv([gradlew, 'stub:assembleRelease']) if proc.returncode != 0: @@ -594,6 +595,12 @@ stub_parser = subparsers.add_parser( 'stub', help='build stub Magisk Manager') stub_parser.set_defaults(func=build_stub) +# Need to bind mount snet sources on top of stub folder +# Note: source code for the snet extension is *NOT* public +snet_parser = subparsers.add_parser( + 'snet', help='build snet extension') +snet_parser.set_defaults(func=build_snet) + zip_parser = subparsers.add_parser( 'zip', help='zip Magisk into a flashable zip') zip_parser.set_defaults(func=zip_main)