Matrix 2.0.5 for Android

matrix/matrix-android/gradle.properties

@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 # org.gradle.parallel=true
 #Tue Jun 20 10:24:33 CST 2017
 
-VERSION_NAME_PREFIX=2.0.2
+VERSION_NAME_PREFIX=2.0.5
 VERSION_NAME_SUFFIX=
 ## two options: Internal (for wechat),  External (for public repo)
 PUBLISH_CHANNEL=Internal

matrix/matrix-android/gradle/Arguments.gradle

@@ -23,4 +23,8 @@ gradle.ext.gonnaPublish = {
     }
 
     return false
+}
+
+gradle.ext.staticLinkCXX = {
+    return gradle.startParameter.projectProperties.containsKey("publishStaticLinkCXXFlavor" as String)
 }

matrix/matrix-android/matrix-android-commons/CMakeLists.txt

@@ -2,4 +2,5 @@ cmake_minimum_required(VERSION 3.4.1)
 project(android-commons C)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libsemi_dlfcn)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libenhance_dlsym)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libxhook)

matrix/matrix-android/matrix-android-commons/build.gradle

@@ -18,7 +18,7 @@ android {
 
         externalNativeBuild {
             cmake {
-                targets = ['xhook', 'semi_dlfcn']
+                targets = ['xhook', 'semi_dlfcn', 'enhance_dlsym']
             }
             exportHeaders {
                 from('src/main/cpp/libxhook') {
@@ -27,6 +27,9 @@ android {
                 from('src/main/cpp/libsemi_dlfcn') {
                     include '**/*.h'
                 }
+                from('src/main/cpp/libenhance_dlsym') {
+                    include '**/*.h'
+                }
             }
         }
     }

matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.4.1)
+project(libenhance_dlsym CXX)
+
+set(enhance_dlsym_source_dir ${CMAKE_CURRENT_SOURCE_DIR})
+
+set(enhance_dlsym_source
+      ${enhance_dlsym_source_dir}/EnhanceDlsym.cpp)
+
+add_library(enhance_dlsym STATIC ${enhance_dlsym_source})
+
+target_include_directories(
+      enhance_dlsym
+      PUBLIC ${enhance_dlsym_source_dir}
+)
+
+target_link_libraries(
+      enhance_dlsym
+      PUBLIC ${log-lib}
+)

matrix/matrix-android/matrix-jectl/src/main/cpp/jectl/EnhanceDlsym.cpp → matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/EnhanceDlsym.cpp

@@ -32,7 +32,7 @@
 #include <dlfcn.h>
 #include <set>
 #include "EnhanceDlsym.h"
-#include "JeLog.h"
+#include "../../../../../matrix-jectl/src/main/cpp/jectl/JeLog.h"
 
 #define TAG "Matrix.EnhanceDl"
 
@@ -283,8 +283,7 @@ namespace enhance {
         if (__handle) {
             auto info = static_cast<DlInfo *>(__handle);
             m_opened_info.erase(info);
-            free(info->strtab);
-            free(info);
+            delete info;
 
             std::map<void *, ElfW(Sym) *> empty;
             empty.swap(m_founded_symtab);

matrix/matrix-android/matrix-jectl/src/main/cpp/jectl/EnhanceDlsym.h → matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/EnhanceDlsym.h

@@ -35,7 +35,14 @@ namespace enhance {
     struct DlInfo {
 
         DlInfo() {}
-        ~DlInfo() {}
+        ~DlInfo() {
+            if (strtab) {
+                free(strtab);
+            }
+            if (symtab) {
+                free(symtab);
+            }
+        }
 
         std::string pathname;
 
@@ -45,10 +52,10 @@ namespace enhance {
         ElfW(Ehdr) *ehdr; // pointing to loaded mem
         ElfW(Phdr) *phdr; // pointing to loaded mem
 
-        char *strtab; // strtab
+        char *strtab = nullptr; // strtab
         ElfW(Word) strtab_size; // size in bytes
 
-        ElfW(Sym)  *symtab;
+        ElfW(Sym)  *symtab = nullptr;
         ElfW(Word) symtab_num;
 
     };

matrix/matrix-android/matrix-backtrace/build.gradle

@@ -62,16 +62,7 @@ android {
 
 }
 
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'androidx.annotation:annotation:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-//    implementation "com.tencent.stubs:logger:${rootProject.LOGGER_VERSION}"
-    implementation project(':matrix-android-lib')
-}
+apply from: project.file('dependencies.gradle')
 
 group = rootProject.GROUP
 version = rootProject.VERSION_NAME

matrix/matrix-android/matrix-backtrace/cxx-static/build.gradle

@@ -0,0 +1,85 @@
+apply plugin: 'com.android.library'
+
+apply from: rootProject.file('gradle/WeChatNativeDepend.gradle')
+
+android {
+    compileSdkVersion rootProject.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.MIN_SDK_VERSION_FOR_HOOK
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode rootProject.VERSION_CODE
+        versionName rootProject.VERSION_NAME
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+
+        ndk {
+            abiFilters rootProject.ABI_FILTERS as String[]
+        }
+
+        externalNativeBuild {
+            cmake {
+                targets = ['wechatbacktrace', 'unwindstack']
+                arguments = ['-DANDROID_STL=c++_static',
+                             "-DEnableLOG=${gradle.enableLog() ? "ON" : "OFF"}" as String,
+                             "-DQUT_STATISTIC_ENABLE=${gradle.enableLog() ? "ON" : "OFF"}" as String]
+            }
+
+            exportHeaders {
+                from('../src/main/cpp') {
+                    include 'common/*.h'
+                    moveToDir 'backtrace'
+                }
+                from('../src/main/cpp/libwechatbacktrace/include') {
+                    include '**/*.h'
+                    moveToDir 'backtrace'
+                }
+                from('../src/main/cpp/external/libunwindstack/include') {
+                    include '**/*.h'
+                    moveToDir 'backtrace'
+                }
+                from('../src/main/cpp/dexfile/include') {
+                    include '**/*.h'
+                    moveToDir 'backtrace'
+                }
+            }
+        }
+    }
+
+    buildTypes {
+
+        release {
+            minifyEnabled false
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "../CMakeLists.txt"
+        }
+    }
+
+    sourceSets {
+        main {
+            java.srcDirs = ['../src/main/java']
+            res.srcDirs = ['../src/main/res']
+            manifest.srcFile '../src/main/AndroidManifest.xml'
+        }
+    }
+
+}
+
+apply from: project.file('../dependencies.gradle')
+
+group = rootProject.GROUP
+version = "${rootProject.VERSION_NAME}-STATIC"
+
+if("External" == rootProject.ext.PUBLISH_CHANNEL) {
+    apply from: rootProject.file('gradle/android-publish.gradle')
+}
+else {
+    apply from: rootProject.file('gradle/WeChatPublish.gradle')
+    wechatPublish {
+        artifactId = POM_ARTIFACT_ID
+    }
+}

matrix/matrix-android/matrix-backtrace/dependencies.gradle

@@ -0,0 +1,10 @@
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.annotation:annotation:1.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+//    implementation "com.tencent.stubs:logger:${rootProject.LOGGER_VERSION}"
+    implementation project(':matrix-android-lib')
+}

matrix/matrix-android/matrix-backtrace/src/main/java/com/tencent/matrix/backtrace/WarmUpService.java

@@ -33,6 +33,7 @@
 
 import androidx.annotation.Nullable;
 
+import com.tencent.matrix.util.MatrixHandlerThread;
 import com.tencent.matrix.util.MatrixLog;
 import com.tencent.matrix.xlog.XLogNative;
 
@@ -221,8 +222,8 @@ public Bundle call(int cmd, Bundle args) {
 
     final static int CMD_WARM_UP_SINGLE_ELF_FILE = 100;
 
-    private final Messenger mMessenger = new Messenger(new Handler() {
-        @SuppressLint("HandlerLeak")
+    @SuppressLint("HandlerLeak")
+    private final Messenger mMessenger = new Messenger(new Handler(MatrixHandlerThread.getDefaultHandlerThread().getLooper()) {
         @Override
         public void handleMessage(final Message msg) {
             super.handleMessage(msg);