TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-07-29 20:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

app: disable multiArch

Browse Source
This commit is contained in:
vvb2060 2025-05-06 15:03:32 +00:00 committed by John Wu
parent 00c1b36837
commit cf12087e21
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/src/main/AndroidManifest.xml
View File

@ -14,7 +14,6 @@
<application <application
android:name=".App" android:name=".App"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:multiArch="true"
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
tools:remove="android:appComponentFactory"> tools:remove="android:appComponentFactory">

15
app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View File

@ -132,7 +132,6 @@ abstract class MagiskInstallImpl protected constructor(
if (entry != null) { if (entry != null) {
val magisk32 = File(installDir, "magisk32") val magisk32 = File(installDir, "magisk32")
zf.getInputStream(entry).writeTo(magisk32) zf.getInputStream(entry).writeTo(magisk32)
magisk32.setExecutable(true)
} }
} }
} }
@ -147,11 +146,15 @@ abstract class MagiskInstallImpl protected constructor(
Os.symlink(lib.path, "$installDir/$name") Os.symlink(lib.path, "$installDir/$name")
} }
// Also symlink magisk32 on 64-bit devices that supports 32-bit // Also extract magisk32 on 64-bit devices that supports 32-bit
val lib32 = info.javaClass.getDeclaredField("secondaryNativeLibraryDir") val abi32 = Const.CPU_ABI_32
.get(info) as String? if (Process.is64Bit() && abi32 != null) {
if (lib32 != null) { val name = "lib/$abi32/libmagisk.so"
Os.symlink("$lib32/libmagisk.so", "$installDir/magisk32"); val entry = javaClass.classLoader!!.getResourceAsStream(name)
if (entry != null) {
val magisk32 = File(installDir, "magisk32")
entry.writeTo(magisk32)
}
} }
} }