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

Stub module always use release build

Browse Source
This commit is contained in:
vvb2060 2020-12-06 06:30:45 +08:00 committed by topjohnwu
parent 38d0f85deb
commit 0b4dd63d36
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle.kts
View File

@ -19,7 +19,7 @@ buildscript {
dependencies { dependencies {
classpath("com.android.tools.build:gradle:4.1.1") classpath("com.android.tools.build:gradle:4.1.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}")
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
@ -27,7 +27,7 @@ buildscript {
} }
} }
tasks.register("clean",Delete::class){ tasks.register("clean", Delete::class) {
delete(rootProject.buildDir) delete(rootProject.buildDir)
} }
@ -110,12 +110,12 @@ subprojects {
buildTypes { buildTypes {
signingConfigs.getByName("config").also { signingConfigs.getByName("config").also {
getByName("debug") { getByName("debug") {
// If keystore exists, sign the APK with custom signature signingConfig = if (it.storeFile?.exists() == true) it
if (it.storeFile?.exists() == true) else signingConfigs.getByName("debug")
signingConfig = it
} }
getByName("release") { getByName("release") {
signingConfig = it signingConfig = if (it.storeFile?.exists() == true) it
else signingConfigs.getByName("debug")
} }
} }
} }

6
build.py
View File

@ -274,9 +274,7 @@ def dump_bin_headers():
binary_dump(src, out, 'magisk_xz') binary_dump(src, out, 'magisk_xz')
stub = op.join(config['outdir'], 'stub-release.apk') stub = op.join(config['outdir'], 'stub-release.apk')
if not op.exists(stub): if not op.exists(stub):
stub = op.join(config['outdir'], 'stub-debug.apk') error('Build stub APK before building "magiskinit"')
if not op.exists(stub):
error('Build stub APK before building "magiskinit"')
with open(op.join('native', 'out', 'binaries.h'), 'w') as out: with open(op.join('native', 'out', 'binaries.h'), 'w') as out:
with open(stub, 'rb') as src: with open(stub, 'rb') as src:
binary_dump(src, out, 'manager_xz') binary_dump(src, out, 'manager_xz')
@ -334,7 +332,7 @@ def build_binary(args):
def build_apk(args, module): def build_apk(args, module):
build_type = 'Release' if args.release else 'Debug' build_type = 'Release' if args.release or module == 'stub' else 'Debug'
proc = execv([gradlew, f'{module}:assemble{build_type}', proc = execv([gradlew, f'{module}:assemble{build_type}',
'-PconfigPath=' + op.abspath(args.config)]) '-PconfigPath=' + op.abspath(args.config)])