WeiguangTWK
/
GKMSPatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix module not loaded on arm

This commit is contained in:
Nullptr 2021-08-24 23:00:49 +08:00
parent d730de27b7
commit fd2b6c9e58
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
appstub/src/main/java/org/lsposed/lspatch/appstub/LSPApplicationStub.java
View File

@ -5,9 +5,8 @@ import android.app.Application;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.InputStreamReader; import java.lang.reflect.Method;
@SuppressLint("UnsafeDynamicallyLoadedCode") @SuppressLint("UnsafeDynamicallyLoadedCode")
public class LSPApplicationStub extends Application { public class LSPApplicationStub extends Application {
@ -27,8 +26,14 @@ public class LSPApplicationStub extends Application {
Log.e("LSPatch", "load dex error", e); Log.e("LSPatch", "load dex error", e);
} }
try (var br = new BufferedReader(new InputStreamReader(Runtime.getRuntime().exec("getprop ro.product.cpu.abi").getInputStream()))) { try {
String arch = br.readLine(); Class<?> VMRuntime = Class.forName("dalvik.system.VMRuntime");
Method getRuntime = VMRuntime.getDeclaredMethod("getRuntime");
getRuntime.setAccessible(true);
Method vmInstructionSet = VMRuntime.getDeclaredMethod("vmInstructionSet");
vmInstructionSet.setAccessible(true);
String arch = (String) vmInstructionSet.invoke(getRuntime.invoke(null));
String path = LSPApplicationStub.class.getClassLoader().getResource("assets/lib/" + arch + "/liblspd.so").getPath().substring(5); String path = LSPApplicationStub.class.getClassLoader().getResource("assets/lib/" + arch + "/liblspd.so").getPath().substring(5);
System.load(path); System.load(path);
} catch (Throwable e) { } catch (Throwable e) {

9
patch/src/main/java/org/lsposed/patch/LSPatch.java
View File

@ -91,9 +91,8 @@ public class LSPatch {
private static final String ORIGINAL_APK_ASSET_PATH = "assets/origin_apk.bin"; private static final String ORIGINAL_APK_ASSET_PATH = "assets/origin_apk.bin";
private static final String ANDROID_MANIFEST_XML = "AndroidManifest.xml"; private static final String ANDROID_MANIFEST_XML = "AndroidManifest.xml";
private static final HashSet<String> APK_LIB_PATH_ARRAY = new HashSet<>(Arrays.asList( private static final HashSet<String> APK_LIB_PATH_ARRAY = new HashSet<>(Arrays.asList(
// "armeabi", "arm",
"armeabi-v7a", "arm64",
"arm64-v8a",
"x86", "x86",
"x86_64" "x86_64"
)); ));
@ -225,7 +224,7 @@ public class LSPatch {
// do not put liblspd.so into apk!lib because x86 native bridge causes crash // do not put liblspd.so into apk!lib because x86 native bridge causes crash
for (String arch : APK_LIB_PATH_ARRAY) { for (String arch : APK_LIB_PATH_ARRAY) {
String entryName = "assets/lib/" + arch + "/liblspd.so"; String entryName = "assets/lib/" + arch + "/liblspd.so";
try (var is = getClass().getClassLoader().getResourceAsStream("assets/so/" + (arch.equals("armeabi") ? "armeabi-v7a" : arch) + "/liblspd.so")) { try (var is = getClass().getClassLoader().getResourceAsStream("assets/so/" + (arch.equals("arm") ? "armeabi-v7a" : (arch.equals("arm64") ? "arm64-v8a" : arch)) + "/liblspd.so")) {
dstZFile.add(entryName, is, false); // no compress for so dstZFile.add(entryName, is, false); // no compress for so
} catch (Throwable e) { } catch (Throwable e) {
// More exception info // More exception info
@ -296,7 +295,7 @@ public class LSPatch {
.setKey(entry.getPrivateKey()) .setKey(entry.getPrivateKey())
.build()).register(dstZFile); .build()).register(dstZFile);
} catch (Exception e) { } catch (Exception e) {
throw new PatchError("Failed to sign apk: " + e.getMessage()); throw new PatchError("Failed to sign apk: " + e);
} }
System.out.println("Done. Output APK: " + outputFile.getAbsolutePath()); System.out.println("Done. Output APK: " + outputFile.getAbsolutePath());