TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-22 10:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
topjohnwu 2022-02-13 14:23:06 -08:00
parent b7fc15d399
commit 2414d5d7f5
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/java/Codegen.kt
View File

@ -76,9 +76,6 @@ fun genKeyData(keysDir: File, outSrc: File) {
fun genStubManifest(srcDir: File, outDir: File): String { fun genStubManifest(srcDir: File, outDir: File): String {
outDir.deleteRecursively() outDir.deleteRecursively()
val mainPkgDir = File(outDir, "com/topjohnwu/magisk")
mainPkgDir.mkdirs()
fun String.ind(level: Int) = replaceIndentByMargin(" ".repeat(level)) fun String.ind(level: Int) = replaceIndentByMargin(" ".repeat(level))
val cmpList = mutableListOf<String>() val cmpList = mutableListOf<String>()
@ -195,7 +192,7 @@ fun genStubManifest(srcDir: File, outDir: File): String {
val clzName = genCmpName() val clzName = genCmpName()
val (pkg, name) = clzName.split('.') val (pkg, name) = clzName.split('.')
val pkgDir = File(outDir, pkg) val pkgDir = File(outDir, pkg)
pkgDir.mkdir() pkgDir.mkdirs()
PrintStream(File(pkgDir, "$name.java")).use { PrintStream(File(pkgDir, "$name.java")).use {
it.println("package $pkg;") it.println("package $pkg;")
it.println("public class $name extends com.topjohnwu.magisk.$type {}") it.println("public class $name extends com.topjohnwu.magisk.$type {}")
@ -220,6 +217,7 @@ fun genStubManifest(srcDir: File, outDir: File): String {
fun genEncryptedResources(res: InputStream, outDir: File) { fun genEncryptedResources(res: InputStream, outDir: File) {
val mainPkgDir = File(outDir, "com/topjohnwu/magisk") val mainPkgDir = File(outDir, "com/topjohnwu/magisk")
mainPkgDir.mkdirs()
// Generate iv and key // Generate iv and key
val iv = ByteArray(16) val iv = ByteArray(16)

2
buildSrc/src/main/java/Setup.kt
View File

@ -188,8 +188,6 @@ fun Project.setupStub() {
val apkTmp = File("${apk}.tmp") val apkTmp = File("${apk}.tmp")
val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedManifest") { val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedManifest") {
inputs.property("versionCode", Config.versionCode)
outputs.file(manifest)
doLast { doLast {
val xml = genStubManifest(templateDir, outSrcDir) val xml = genStubManifest(templateDir, outSrcDir)
manifest.parentFile.mkdirs() manifest.parentFile.mkdirs()

7
stub/src/main/java/com/topjohnwu/magisk/DynLoad.java
View File

@ -108,11 +108,11 @@ public class DynLoad {
int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_SERVICES int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_SERVICES
| PackageManager.GET_PROVIDERS | PackageManager.GET_RECEIVERS; | PackageManager.GET_PROVIDERS | PackageManager.GET_RECEIVERS;
var pm = context.getPackageManager();
final PackageInfo info; final PackageInfo info;
try { try {
info = context.getPackageManager() info = pm.getPackageInfo(context.getPackageName(), flags);
.getPackageInfo(context.getPackageName(), flags);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// Impossible // Impossible
throw new RuntimeException(e); throw new RuntimeException(e);
@ -122,8 +122,7 @@ public class DynLoad {
final var cl = loadApk(context); final var cl = loadApk(context);
if (cl != null) try { if (cl != null) try {
var pkgInfo = context.getPackageManager() var pkgInfo = pm.getPackageArchiveInfo(apk.getPath(), flags);
.getPackageArchiveInfo(apk.getPath(), flags);
cl.updateComponentMap(info, pkgInfo); cl.updateComponentMap(info, pkgInfo);
var appInfo = pkgInfo.applicationInfo; var appInfo = pkgInfo.applicationInfo;