You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/07 10:00:07 UTC

[2/4] incubator-weex git commit: * [android] add gradle script task to get so size

* [android] add gradle script  task to get so size


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54f62a8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54f62a8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54f62a8e

Branch: refs/heads/0.11-dev
Commit: 54f62a8ec69984404f86df6be69bb6be1b634e87
Parents: 1da458e
Author: zshshr <zh...@gmail.com>
Authored: Tue Mar 7 17:26:47 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Mar 7 17:26:47 2017 +0800

----------------------------------------------------------------------
 android/sdk/build.gradle                        | 21 +++++++++++---------
 .../taobao/weex/utils/WXSoInstallMgrSdk.java    |  5 +++--
 2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54f62a8e/android/sdk/build.gradle
----------------------------------------------------------------------
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index b4c0eac..939429b 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -54,19 +54,22 @@ android {
     resourcePrefix "weex"
 
     useLibrary 'org.apache.http.legacy'
+    def line
+    new File(projectDir,"assets/main.js").withReader { line = it.readLine() }
+    def m = line =~ /[A-Z\s]+\s+([0-9\.]+),\s+Build\s+[0-9]+/;
+    def jsfmVersion = m[0][1]
+    println jsfmVersion
 
-    def jsfmVersion = "0.15.2"
-    try{
-        def line
-        new File("assets/main.js").withReader { line = it.readLine() }
-        def m = line =~ /[A-Z\s]+\:\s+([0-9\.]+)\s+Build\s+[0-9]+/;
-        jsfmVersion = m[0][1]
-        println jsfmVersion
-    } catch (java.lang.Exception e) {
 
-    }
+    def ARMEABI_Size = new File(projectDir,"libs/armeabi/libweexv8.so").length();
+    def X86_Size = new File(projectDir,"libs/x86/libweexv8.so").length();
+    println "ARMEABI_Size: "+ARMEABI_Size;
+    println "X86_Size:" + X86_Size;
+
 
     defaultConfig {
+        buildConfigField "long", "ARMEABI_Size", "${ARMEABI_Size}"
+        buildConfigField "long", "X86_Size", "${X86_Size}"
         buildConfigField "String", "buildJavascriptFrameworkVersion", "\"${jsfmVersion}\""
         buildConfigField "String", "buildVersion", "\"${version}\""
         minSdkVersion 14

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54f62a8e/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
----------------------------------------------------------------------
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
index 650c036..77492b5 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -208,6 +208,7 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.Build;
 
+import com.taobao.weappplus_sdk.BuildConfig;
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.adapter.IWXUserTrackAdapter;
 import com.taobao.weex.common.WXErrorCode;
@@ -284,7 +285,7 @@ public class WXSoInstallMgrSdk {
     }
 
     boolean InitSuc = false;
-    if (checkSoIsValid(libName, ARMEABI_Size) ||checkSoIsValid(libName, X86_Size)) {
+    if (checkSoIsValid(libName, BuildConfig.ARMEABI_Size) ||checkSoIsValid(libName, BuildConfig.X86_Size)) {
 
       /**
        * Load library with {@link System#loadLibrary(String)}
@@ -361,7 +362,7 @@ public class WXSoInstallMgrSdk {
    * @param size  the right size of lib
    * @return true for valid  ; false for InValid
    */
-  static boolean checkSoIsValid(String libName, int size) {
+  static boolean checkSoIsValid(String libName, long size) {
     Context context = mContext;
     if (null == context) {
       return false;