MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update snet extension to prevent crashes on release builds

Browse Source
This commit is contained in:
topjohnwu 2020-08-24 06:24:44 -07:00
parent 79f549795b
commit d6062944f1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/topjohnwu/magisk/core/Const.kt
View File

@ -12,8 +12,8 @@ object Const {
const val MAGISK_LOG = "/cache/magisk.log" const val MAGISK_LOG = "/cache/magisk.log"
// Versions // Versions
const val SNET_EXT_VER = 14 const val SNET_EXT_VER = 15
const val SNET_REVISION = "5e28617412bdad2396eab87fa786094d8242e568" const val SNET_REVISION = "d494bc726e86166913a13629e3b1336728ec5d7f"
const val BOOTCTL_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df" const val BOOTCTL_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df"
// Misc // Misc

9
build.py
View File

@ -358,8 +358,9 @@ def build_stub(args):
build_apk(args, 'stub') build_apk(args, 'stub')
# Bind mount snet package on top of the stub folder
def build_snet(args): 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') header('* Building snet extension')
proc = execv([gradlew, 'stub:assembleRelease']) proc = execv([gradlew, 'stub:assembleRelease'])
if proc.returncode != 0: if proc.returncode != 0:
@ -594,6 +595,12 @@ stub_parser = subparsers.add_parser(
'stub', help='build stub Magisk Manager') 'stub', help='build stub Magisk Manager')
stub_parser.set_defaults(func=build_stub) 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_parser = subparsers.add_parser(
'zip', help='zip Magisk into a flashable zip') 'zip', help='zip Magisk into a flashable zip')
zip_parser.set_defaults(func=zip_main) zip_parser.set_defaults(func=zip_main)