Copy shared library from armeabi-v7a into armeabi (#2598)

apache · Jun 21, 2019 · cdf772f · cdf772f
1 parent a0d26fc
commit cdf772f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore
@@ -17,9 +17,5 @@ assets/weex-main-jsfm.js
 assets/weex-rax-api.js
 .externalNativeBuild
 
-/libs/armeabi/libweexcore.so
-/libs/armeabi/libweexjss.so
-/libs/armeabi-v7a/libweexcore.so
-/libs/armeabi-v7a/libweexjss.so
-/libs/x86/libweexcore.so
-/libs/x86/libweexjss.so
+/libs/armeabi
+
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -334,5 +334,28 @@ afterEvaluate { project ->
                 it.path = "${it.relativePath.segments[-2]}_${it.name}"
             }
         }
+
+        if(project.hasProperty('supportArmeabi') && "true" == project.getProperty('supportArmeabi')){
+            //Copy stripped shared library from armeabi-v7a into armeabi
+            copy{
+                from transformNativeLibsWithStripDebugSymbolForRelease
+                into project.android.sourceSets.main.jniLibs.srcDirs[-1]
+                include '**/armeabi-v7a/**'
+                exclude '**/libc++_shared.so'
+                eachFile {
+                    it.path = "armeabi/${it.name}"
+                }
+            }
+
+            //Copy Unstripped shared library from armeabi-v7a into armeabi
+            copy{
+                from transformNativeLibsWithMergeJniLibsForRelease
+                into new File(project.buildDir, "unstrippedSo")
+                include '**/armeabi-v7a/libweexjss.so', '**/armeabi-v7a/libweexcore.so'
+                eachFile {
+                    it.path = "armeabi_${it.name}"
+                }
+            }
+        }
     }
 }