Merge branch 'feature/dev-publish-static' into 'feature/dev' (merge r…

…equest !152) feature/dev-publish-static 增加静态链接 libc++ 版本，通过版本号后缀 -STATIC 区分，默认关闭，通过 gradle 参数控制开启，publish 到 maven central 时开启
JaminZhou · Jan 21, 2022 · 972c692 · 972c692
2 parents 1704122 + 60c1466
commit 972c692
Show file tree

Hide file tree

Showing 11 changed files with 275 additions and 34 deletions.
diff --git a/matrix/matrix-android/gradle/Arguments.gradle b/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)
 }
diff --git a/matrix/matrix-android/matrix-backtrace/build.gradle b/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

diff --git a/matrix/matrix-android/matrix-backtrace/cxx-static/build.gradle b/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
+    }
+}
diff --git a/matrix/matrix-android/matrix-backtrace/dependencies.gradle b/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')
+}
diff --git a/matrix/matrix-android/matrix-hooks/build.gradle b/matrix/matrix-android/matrix-hooks/build.gradle
@@ -47,18 +47,7 @@ android {
 
 }
 
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    testImplementation 'junit:junit:4.12'
-    implementation 'androidx.annotation:annotation:1.0.0'
-    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')
-    implementation project(':matrix-backtrace')
-    implementation project(':matrix-android-commons')
-}
+apply from: project.file('dependencies.gradle')
 
 group = rootProject.GROUP
 version = rootProject.VERSION_NAME

diff --git a/matrix/matrix-android/matrix-hooks/cxx-static/build.gradle b/matrix/matrix-android/matrix-hooks/cxx-static/build.gradle
@@ -0,0 +1,71 @@
+apply plugin: 'com.android.library'
+
+apply from: rootProject.file('gradle/WeChatNativeDepend.gradle')
+
+android {
+    compileSdkVersion rootProject.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion 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 {
+                arguments = ['-DANDROID_STL=c++_static', "-DEnableLOG=${gradle.enableLog() ? "ON" : "OFF"}" as String]
+            }
+
+            exportHeaders {
+                from('../src/main/cpp/common') {
+                    include '**/*.h'
+                    include '*.h'
+                }
+            }
+        }
+    }
+
+    buildTypes {
+
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    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
+    }
+}
diff --git a/matrix/matrix-android/matrix-hooks/dependencies.gradle b/matrix/matrix-android/matrix-hooks/dependencies.gradle
@@ -0,0 +1,12 @@
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.annotation:annotation:1.0.0'
+    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')
+    implementation project(':matrix-backtrace')
+    implementation project(':matrix-android-commons')
+}
diff --git a/matrix/matrix-android/matrix-opengl-leak/build.gradle b/matrix/matrix-android/matrix-opengl-leak/build.gradle
@@ -46,17 +46,7 @@ android {
     }
 }
 
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation project(':matrix-android-lib')
-    implementation project(':matrix-android-commons')
-    implementation project(':matrix-backtrace')
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-}
+apply from: project.file('dependencies.gradle')
 
 group = rootProject.GROUP
 version = rootProject.VERSION_NAME

diff --git a/matrix/matrix-android/matrix-opengl-leak/cxx-static/build.gradle b/matrix/matrix-android/matrix-opengl-leak/cxx-static/build.gradle
@@ -0,0 +1,72 @@
+apply plugin: 'com.android.library'
+
+apply from: rootProject.file('gradle/WeChatNativeDepend.gradle')
+
+android {
+    compileSdkVersion rootProject.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion 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 {
+                arguments = ['-DANDROID_STL=c++_static', "-DEnableLOG=${gradle.enableLog() ? "ON" : "OFF"}" as String]
+            }
+
+            exportHeaders {
+                from('../src/main/cpp/common') {
+                    include '**/*.h'
+                    include '*.h'
+                }
+            }
+        }
+    }
+
+    buildTypes {
+
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "../CMakeLists.txt"
+        }
+    }
+
+    sourceSets {
+        main {
+            java.srcDirs = ['../src/main/java']
+            res.srcDirs = ['../src/main/res']
+            aidl.srcDirs = ['../src/main/aidl']
+            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
+    }
+}
diff --git a/matrix/matrix-android/matrix-opengl-leak/dependencies.gradle b/matrix/matrix-android/matrix-opengl-leak/dependencies.gradle
@@ -0,0 +1,11 @@
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation project(':matrix-android-lib')
+    implementation project(':matrix-android-commons')
+    implementation project(':matrix-backtrace')
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+}
diff --git a/matrix/matrix-android/settings.gradle b/matrix/matrix-android/settings.gradle
@@ -1,4 +1,4 @@
-apply from:"$rootDir/gradle/Arguments.gradle"
+apply from: "$rootDir/gradle/Arguments.gradle"
 
 // Gradle plugin
 include ':matrix-gradle-plugin'
@@ -33,3 +33,9 @@ include ':test:matrix-backtrace-benchmark'
 // TEST
 include ':test:test-backtrace'
 include ':test:test-memoryhook'
+
+if (gradle.staticLinkCXX()) {
+    include ':matrix-hooks:cxx-static'
+    include ':matrix-opengl-leak:cxx-static'
+    include ':matrix-backtrace:cxx-static'
+}