调整maven以及修复多线程加载so问题

Author: lixiaoliang04

README.md

@@ -9,9 +9,8 @@ android {
     compileSdk 33
     defaultConfig {
         applicationId "com.imf.test"
-        minSdkVersion 14
-        //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -30,18 +29,6 @@ android {
         }
     }
 
-//    flavorDimensions "default"
-//    productFlavors {
-//        ioTestV7a {
-//            dimension "default"
-//            ndk.abiFilters("armeabi-v7a")
-//        }
-//        ioTestV8a {
-//            dimension "default"
-//            ndk.abiFilters("arm64-v8a")
-//        }
-//    }
-
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']

app/build.gradle

@@ -28,6 +28,7 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        checkSoLoad();
         fullScreen();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
@@ -37,7 +38,6 @@ protected void onCreate(Bundle savedInstanceState) {
         final Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.image);
         updateCacheDir();
         TextView tv = findViewById(R.id.sample_text);
-        checkSoLoad();
         tv.setOnClickListener(v -> {
             StringBuilder stringBuilder = new StringBuilder();
             v.postDelayed(new Runnable() {
@@ -95,7 +95,7 @@ public void run() {
     }
 
     private void updateCacheDir() {
-        mCache.setText(new StringBuilder().append("缓存目录情况:\n").append(getDirInfo(getJniLibs())));
+        mCache.setText(new StringBuilder().append("缓存目录情况:\n").append(getDirInfo(getJniLibs(), "")));
     }
 
     public void onClearSoFile(View view) {
@@ -136,19 +136,19 @@ private boolean deleteDir(File dir) {
         return dir.delete();
     }
 
-    private String getDirInfo(File file) {
+    private String getDirInfo(File file, String startStr) {
         if (file.isDirectory()) {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append(file.getName()).append("(dir):[\n");
             File[] children = file.listFiles();
             for (int i = 0; i < children.length; i++) {
                 File child = children[i];
-                stringBuilder.append(getDirInfo(child)).append("\n");
+                stringBuilder.append(getDirInfo(child, startStr + "\t\t")).append("\n");
             }
             stringBuilder.deleteCharAt(stringBuilder.length() - 1);
-            return stringBuilder.insert(0, "\t- ").append(" ]").toString();
+            return stringBuilder.insert(0, startStr + "\t- ").append(" ]").toString();
         } else {
-            return "\t\t* " + file.getName();
+            return startStr + "\t\t* " + file.getName();
         }
     }
 

app/src/main/java/com/imf/test/MainActivity.java

@@ -1,19 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        maven { url uri("${rootDir}/maven") }
         mavenLocal()
         mavenCentral()
         maven { url "https://jitpack.io" }
-        maven { url uri("${rootDir}/maven") }
         maven { url "https://maven.aliyun.com/repository/google" }
         maven { url "https://maven.aliyun.com/repository/jcenter" }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
         if (Boolean.parseBoolean(userPlugin)) {
-            classpath "com.imf.so:load-hook-plugin:${SO_PLUGIN_VERSION}"
-            classpath "com.imf.so:file-plugin:${SO_PLUGIN_VERSION}"
+            classpath "${GROUP_ID}:load-hook-plugin:${SO_PLUGIN_VERSION}"
+            classpath "${GROUP_ID}:file-plugin:${SO_PLUGIN_VERSION}"
         }
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,10 +22,10 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url uri("${project.rootProject.rootDir}/maven") }
         mavenLocal()
         mavenCentral()
         maven { url "https://jitpack.io" }
-        maven { url uri("${project.rootProject.rootDir}/maven") }
         maven { url "https://maven.aliyun.com/repository/google" }
         maven { url "https://maven.aliyun.com/repository/jcenter" }
         maven { url "https://raw.githubusercontent.com/Android-Mainli/Maven/master" }
@@ -89,10 +89,4 @@ subprojects { pro ->
             }
         }
     }
-}
-
-task aaa {
-    doLast {
-        println org.gradle.internal.os.OperatingSystem.current()
-    }
 }

build.gradle

@@ -47,32 +47,9 @@ abstract class SoFilePlugin : Plugin<Project> {
 
         val osdetector = project.extensions.getByType(OsDetector::class.java)
 
-        //region 尝试查找 aar 里面的可执行文件
-        val depAAR = project.dependencies.add(
-            p7zConfig.name, mapOf(
-                "group" to "com.github.mcxinyu.Android-So-Handler",
-                "name" to "p7z",
-                "classifier" to "all",
-                "version" to "0.0.9-fix1",
-                "ext" to "aar"
-            )
-        )
-        runCatching {
-            val aar = p7zConfig.fileCollection(depAAR).singleFile
-            ZipFile(aar).unzipTo(aar.parentFile)
-            val file = aar.parentFile.listFiles()?.firstOrNull {
-                it.name.contains(osdetector.classifier)
-            } ?: throw FileNotFoundException()
-            if (!file.canExecute() && !file.setExecutable(true)) {
-                throw GradleException("Cannot set ${file} as executable")
-            }
-            return file.absolutePath
-        }
-        //endregion
-
         val dep = project.dependencies.add(
             p7zConfig.name, mapOf<String, String>(
-                "group" to "com.mainli",
+                "group" to "com.github.mainlxl.Android-So-Handler",
                 "name" to "p7z",
                 "classifier" to osdetector.classifier,
                 "version" to "1.0.1",
@@ -86,6 +63,7 @@ abstract class SoFilePlugin : Plugin<Project> {
             }
             return file.absolutePath
         }
+        // 兜底使用系统环境变量配置的7z命令
         val os = System.getenv("OS")?.lowercase()
         if (os != null && os.contains("windows")) {
             return "7z.exe"

file-plugin/src/main/kotlin/com/imf/plugin/so/Plugin.kt

@@ -19,8 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 ANDROID_GRADLE_VERSION=7.3.0
 #SO_PLUGIN_VERSION=0.0.4-SNAPSHOT
-#SO_PLUGIN_VERSION=0.0.9
-SO_PLUGIN_VERSION=0.0.9-fix-local
+SO_PLUGIN_VERSION=0.0.11
 userPlugin=true
-
-GROUP_ID=com.imf.so
+GROUP_ID=com.github.mainlxl.Android-So-Handler

gradle.properties

@@ -6,12 +6,10 @@
  * @Description: so库加载代理
  */
 public class SoLoadHook {
-    public static SoLoadProxy DEFAULT_SYSTEM_LOAD = new DefaultSoLoadProxy();
-    private static SoLoadProxy sSoLoadProxy = DEFAULT_SYSTEM_LOAD;
+    private static volatile SoLoadProxy sSoLoadProxy = new DefaultSoLoadProxy();
 
     public static void setSoLoadProxy(SoLoadProxy soLoadProxy) {
         if (soLoadProxy == null) {
-            sSoLoadProxy = DEFAULT_SYSTEM_LOAD;
             return;
         }
         sSoLoadProxy = soLoadProxy;

load-hook/src/main/java/com/imf/so/SoLoadHook.java

@@ -0,0 +1 @@
+df7c8738d80b3e040f331dff3c1a573b

maven/com/github/mainlxl/Android-So-Handler/android-un7z/0.0.11/android-un7z-0.0.11-sources.jar

@@ -0,0 +1 @@
+612410c467d653fce6f71e262763088f1c9ec72f