Fix start load failed first time

apache · Jun 18, 2019 · 04b096c · 04b096c
1 parent e6c6008
commit 04b096c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle
@@ -6,10 +6,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion project.compileSdkVersion
-//    buildToolsVersion project.buildToolsVersion
-//      packagingOptions {
-//          pickFirst '**/libc++_shared.so'
-//      }
     defaultConfig {
         applicationId "com.alibaba.weex"
         minSdkVersion project.minSdkVersion

diff --git a/android/playground/app/src/main/AndroidManifest.xml b/android/playground/app/src/main/AndroidManifest.xml
@@ -128,15 +128,15 @@ under the License.
             android:name=".update.UpdateService"
             android:exported="false" />
 
-        <!--<provider-->
-            <!--android:name="android.support.v4.content.FileProvider"-->
-            <!--android:authorities="com.alibaba.weex.fileprovider"-->
-            <!--android:grantUriPermissions="true"-->
-            <!--android:exported="false">-->
-            <!--<meta-data-->
-                <!--android:name="android.support.FILE_PROVIDER_PATHS"-->
-                <!--android:resource="@xml/filepaths" />-->
-        <!--</provider>-->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.alibaba.weex.fileprovider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
 
     </application>
 

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -90,11 +90,6 @@ android {
 //    buildToolsVersion project.buildToolsVersion
     resourcePrefix "weex"
     useLibrary 'org.apache.http.legacy'
-    packagingOptions {
-        exclude 'lib/armeabi-v7a/libc++_shared.so'
-        exclude 'lib/arm64-v8a/libc++_shared.so'
-        exclude 'lib/x86/libc++_shared.so'
-    }
     copy {
         from '../../pre-build'
         into new File(projectDir,"assets")
@@ -298,7 +293,7 @@ task checkNdkVersion() {
 
 preBuild.dependsOn checkNdkVersion
 
-def siteUrl = 'http://weex.incubator.apache.org'
+def siteUrl = 'https://weex.incubator.apache.org'
 def gitUrl = 'https://github.com/apache/incubator-weex.git'
 group = "com.taobao.android"
 install {
@@ -309,12 +304,12 @@ install {
                 packaging 'aar'
                 name 'weex_sdk'
                 url siteUrl
-                // licenses {
-                //     license {
-                //         name 'The Apache Software License, Version 2.0'
-                //         url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                //     }
-                // }
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
                 developers {
                     developer {
                         id 'weex alibaba'
@@ -355,6 +350,7 @@ bintray {
         version {
             //The version to be published
             name = project.version
+            vcsTag = project.version
         }
     }
 }

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -127,6 +127,8 @@ public class WXEnvironment {
 
   public static final String CORE_SO_NAME = "weexcore";
   public static final String CORE_JSS_SO_NAME = "weexjss";
+  public static final String CORE_JSB_SO_NAME = "weexjsb";
+  public static final String CORE_JST_SO_NAME = "weexjst";
   public static final String CORE_JSC_SO_NAME = "JavaScriptCore";
   /**
    * this marked jsb.so's version, Change this if we want to update jsb.so

diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -22,6 +22,8 @@
 import android.content.pm.ApplicationInfo;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
+
 import com.taobao.weex.IWXStatisticsListener;
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.adapter.IWXSoLoaderAdapter;
@@ -217,9 +219,11 @@ public static void copyStartUpSo() {
         // if android api < 16 copy libweexjst.so else copy libweexjsb.so
         boolean pieSupport = true;
         File newfile;
+        String startSoName = WXEnvironment.CORE_JSB_SO_NAME;
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
           pieSupport = false;
           newfile = new File(cacheFile + STARTUPSOANDROID15);
+          startSoName = WXEnvironment.CORE_JST_SO_NAME;
         } else {
           newfile = new File(cacheFile + STARTUPSO);
         }
@@ -261,6 +265,18 @@ public static void copyStartUpSo() {
         }
 
         File oldfile = new File(soName);
+
+
+        if(!oldfile.exists()) {
+          try {
+            String weexjsb = ((PathClassLoader) (WXSoInstallMgrSdk.class.getClassLoader())).findLibrary(startSoName);
+            oldfile = new File(weexjsb);
+          } catch (Throwable throwable) {
+            // do nothing
+          }
+
+        }
+
         if (oldfile.exists()) {
           WXFileUtils.copyFile(oldfile, newfile);
         } else {