修复dump闪退

WrBug · WrBug · commit 4370092db069 · 2019-01-07T19:39:16.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -94,3 +94,5 @@ if (propFile.canRead()) {
     println 'release build not found signing file'
     android.buildTypes.release.signingConfig = null
 }
+
+
diff --git a/xposedmodule/build.gradle b/xposedmodule/build.gradle
@@ -15,11 +15,11 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
-                cppFlags "-std=c++14","-fms-extensions"
+                cppFlags "-std=c++14", "-fms-extensions"
             }
         }
         ndk {
-            abiFilters "armeabi", "armeabi-v7a","arm64-v8a"
+            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a"
         }
 
     }
@@ -53,3 +53,13 @@ dependencies {
 repositories {
     mavenCentral()
 }
+task buildSo(dependsOn: "compileReleaseSources") {
+    doLast {
+        println "更新so"
+        exec {
+            ignoreExitValue true
+            commandLine "pwd"
+            commandLine "sh", "./script/so.sh"
+        }
+    }
+}
diff --git a/xposedmodule/script/so.sh b/xposedmodule/script/so.sh
@@ -0,0 +1,11 @@
+result=$(ls build/intermediates/cmake/release/obj)|grep 'No such file or directory'
+echo $result
+if [ -z "${result}" ]; then
+    echo '目录已生成'
+    cp build/intermediates/cmake/release/obj/arm64-v8a/libnativeDump.so src/main/assets/nativeDumpV8a.so
+    cp build/intermediates/cmake/release/obj/armeabi-v7a/libnativeDump.so src/main/assets/nativeDumpV7a.so
+    cp build/intermediates/cmake/release/obj/armeabi/libnativeDump.so src/main/assets/nativeDump.so
+    echo '完成'
+else
+    echo '目录未生成'
+fi
diff --git a/xposedmodule/src/main/assets/nativeDump.so b/xposedmodule/src/main/assets/nativeDump.so
diff --git a/xposedmodule/src/main/assets/nativeDumpV7a.so b/xposedmodule/src/main/assets/nativeDumpV7a.so
diff --git a/xposedmodule/src/main/assets/nativeDumpV8a.so b/xposedmodule/src/main/assets/nativeDumpV8a.so
diff --git a/xposedmodule/src/main/cpp/inlineHook.c b/xposedmodule/src/main/cpp/inlineHook.c
@@ -25,7 +25,7 @@ created time: 2015-11-30
 #ifndef PAGE_SIZE
 #define PAGE_SIZE 4096
 #endif
-#define TAG "dumpDex->"
+#define TAG "developerhelper.native-->"
 
 #define PAGE_START(addr)    (~(PAGE_SIZE - 1) & (addr))
 #define SET_BIT0(addr)        (addr | 1)
diff --git a/xposedmodule/src/main/cpp/native.cpp b/xposedmodule/src/main/cpp/native.cpp
@@ -4,7 +4,7 @@
 #include "native.h"
 #include "inlineHook.h"
 
-#define TAG "dumpDex->"
+#define TAG "developerhelper.native-->"
 
 
 JNIEXPORT void JNICALL Java_com_wrbug_developerhelper_xposed_dumpdex_Native_dump
diff --git a/xposedmodule/src/main/cpp/util/deviceutils.cpp b/xposedmodule/src/main/cpp/util/deviceutils.cpp
@@ -6,7 +6,7 @@
 #include "deviceutils.h"
 #include "fileutils.h"
 
-#define TAG "dumpDex->"
+#define TAG "developerhelper.native-->"
 
 const static long DEX_MIN_LEN = 102400L;
 static int sdk_int = 0;
@@ -72,15 +72,17 @@ static void *new_arm64_open_common(uint8_t *base, size_t size, void *location,
                                    bool verify,
                                    bool verify_checksum,
                                    void *error_meessage, void *verify_result) {
+    __android_log_print(ANDROID_LOG_ERROR, TAG, "new_arm64_open_common");
     if (size < DEX_MIN_LEN) {
         __android_log_print(ANDROID_LOG_ERROR, TAG, "size =%u", size);
-        return nullptr;
+    } else {
+        __android_log_print(ANDROID_LOG_INFO, TAG, "保存64位apk dex文件：%p", base);
+        save_dex_file(base, size);
     }
-    save_dex_file(base, size);
     void *result = old_arm64_open_common(base, size, location, location_checksum,
-                                        oat_dex_file, verify, verify_checksum,
-                                        error_meessage,
-                                        verify_result);
+                                         oat_dex_file, verify, verify_checksum,
+                                         error_meessage,
+                                         verify_result);
     return result;
 }
 /////////////////////
@@ -89,21 +91,24 @@ static void *new_arm64_open_common(uint8_t *base, size_t size, void *location,
 
 /////////////////////
 static void *(*old_arm64_open_memory)(uint8_t *base,
-                                             size_t size, void *location,
-                                             uint32_t location_checksum,
-                                             void *mem_map,
-                                             void *oat_dex_file, void *error_msg);
+                                      size_t size, void *location,
+                                      uint32_t location_checksum,
+                                      void *mem_map,
+                                      void *oat_dex_file, void *error_msg);
 
 static void *
 (new_arm64_open_memory)(uint8_t *base, size_t size, void *location,
                         uint32_t location_checksum, void *mem_map,
                         void *oat_dex_file, void *error_msg) {
+    __android_log_print(ANDROID_LOG_INFO, TAG, "new_arm64_open_memory");
+
     if (size < DEX_MIN_LEN) {
-        return nullptr;
+        __android_log_print(ANDROID_LOG_INFO, TAG, "size < DEX_MIN_LEN");
+    } else {
+        save_dex_file(base, size);
     }
-    save_dex_file(base, size);
     return (*old_arm64_open_memory)(base, size, location, location_checksum, mem_map,
-                                           oat_dex_file, error_msg);
+                                    oat_dex_file, error_msg);
 }
 /////////////////////
 
@@ -120,10 +125,14 @@ static void *
 (new_nougat_open_memory)(void *DexFile_thiz, uint8_t *base, size_t size, void *location,
                          uint32_t location_checksum, void *mem_map,
                          void *oat_dex_file, void *error_msg) {
+    __android_log_print(ANDROID_LOG_INFO, TAG, "new_nougat_open_memory");
+
     if (size < DEX_MIN_LEN) {
-        return nullptr;
+        __android_log_print(ANDROID_LOG_INFO, TAG, "size < DEX_MIN_LEN");
+    } else {
+        __android_log_print(ANDROID_LOG_INFO, TAG, "保存64位nougat apk dex文件：%p", base);
+        save_dex_file(base, size);
     }
-    save_dex_file(base, size);
     return (*old_nougat_open_memory)(DexFile_thiz, base, size, location, location_checksum, mem_map,
                                      oat_dex_file, error_msg);
 }
@@ -140,10 +149,12 @@ static void *new_opencommon(void *DexFile_thiz, uint8_t *base, size_t size, void
                             uint32_t location_checksum, void *oat_dex_file, bool verify,
                             bool verify_checksum,
                             void *error_meessage, void *verify_result) {
+    __android_log_print(ANDROID_LOG_INFO, TAG, "new_opencommon");
     if (size < DEX_MIN_LEN) {
-        return nullptr;
+        __android_log_print(ANDROID_LOG_INFO, TAG, "size < DEX_MIN_LEN");
+    } else {
+        save_dex_file(base, size);
     }
-    save_dex_file(base, size);
     return (*old_opencommon)(DexFile_thiz, base, size, location, location_checksum,
                              oat_dex_file, verify, verify_checksum, error_meessage,
                              verify_result);
diff --git a/xposedmodule/src/main/cpp/util/fileutils.cpp b/xposedmodule/src/main/cpp/util/fileutils.cpp
@@ -5,7 +5,7 @@
 
 #include "fileutils.h"
 
-#define TAG "dumpDex->"
+#define TAG "developerhelper.native-->"
 
 static char pname[256];
 
diff --git a/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/Dump.kt b/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/Dump.kt
@@ -11,7 +11,7 @@ import java.io.File
 object Dump {
     fun log(txt: String) {
 
-        XposedBridge.log("dumpdex-> $txt")
+        XposedBridge.log("developerhelper.native--> $txt")
     }
 
     fun start(lpparam: XC_LoadPackage.LoadPackageParam) {
diff --git a/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/LowSdkDump.kt b/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/LowSdkDump.kt
@@ -7,6 +7,7 @@ import com.wrbug.developerhelper.xposed.dumpdex.DeviceUtils
 import com.wrbug.developerhelper.xposed.util.FileUtils
 import com.wrbug.developerhelper.xposed.dumpdex.Native
 import com.wrbug.developerhelper.xposed.dumpdex.PackerInfo
+import com.wrbug.developerhelper.xposed.xposedLog
 
 import java.io.File
 
@@ -23,8 +24,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage
  */
 object LowSdkDump {
     fun log(txt: String) {
-
-        XposedBridge.log("dumpdex.LowSdkDump-> $txt")
+        txt.xposedLog("developerhelper.LowSdkDump-->")
     }
 
     fun init(lpparam: XC_LoadPackage.LoadPackageParam, type: PackerInfo.Type) {
diff --git a/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/Native.kt b/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/Native.kt
@@ -1,7 +1,6 @@
 package com.wrbug.developerhelper.xposed.dumpdex
 
 import com.wrbug.developerhelper.xposed.xposedLog
-import de.robv.android.xposed.XposedBridge
 
 /**
  * Native
diff --git a/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/OreoDump.kt b/xposedmodule/src/main/java/com/wrbug/developerhelper/xposed/dumpdex/OreoDump.kt
@@ -18,7 +18,7 @@ object OreoDump {
         if (!BuildConfig.DEBUG) {
             return
         }
-        XposedBridge.log("dumpdex-> $txt")
+        XposedBridge.log("developerhelper.native--> $txt")
     }
 
     fun init(lpparam: XC_LoadPackage.LoadPackageParam) {

Original file line number	Diff line number	Diff line change
`@@ -94,3 +94,5 @@ if (propFile.canRead()) {`
`94`	`94`	`println 'release build not found signing file'`
`95`	`95`	`android.buildTypes.release.signingConfig = null`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ android {`
`15`	`15`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`16`	`16`	`externalNativeBuild {`
`17`	`17`	`cmake {`
`18`		`- cppFlags "-std=c++14","-fms-extensions"`
	`18`	`+ cppFlags "-std=c++14", "-fms-extensions"`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`ndk {`
`22`		`- abiFilters "armeabi", "armeabi-v7a","arm64-v8a"`
	`22`	`+ abiFilters "armeabi", "armeabi-v7a", "arm64-v8a"`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`}`
`@@ -53,3 +53,13 @@ dependencies {`
`53`	`53`	`repositories {`
`54`	`54`	`mavenCentral()`
`55`	`55`	`}`
	`56`	`+task buildSo(dependsOn: "compileReleaseSources") {`
	`57`	`+ doLast {`
	`58`	`+ println "更新so"`
	`59`	`+ exec {`
	`60`	`+ ignoreExitValue true`
	`61`	`+ commandLine "pwd"`
	`62`	`+ commandLine "sh", "./script/so.sh"`
	`63`	`+ }`
	`64`	`+ }`
	`65`	`+}`