You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by lu...@apache.org on 2019/07/04 10:09:49 UTC
[incubator-weex] branch release/0.26 updated: [Android] update jsfm
to 0.27
This is an automated email from the ASF dual-hosted git repository.
luckychen pushed a commit to branch release/0.26
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/release/0.26 by this push:
new ebb943a [Android] update jsfm to 0.27
ebb943a is described below
commit ebb943a162aa9775497df778e6396e446845d78e
Author: zhongcang <pe...@alibaba-inc.com>
AuthorDate: Thu Jul 4 18:02:11 2019 +0800
[Android] update jsfm to 0.27
[Android] add data record
[Android] add build script for build runtime-jss.so
---
android/sdk/build_jss_r.sh | 24 ++++++++++++++++++++++
.../com/taobao/weex/performance/WXInstanceApm.java | 1 +
.../com/taobao/weex/utils/WXExceptionUtils.java | 7 ++++---
pre-build/weex-main-jsfm.js | 4 ++--
4 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/android/sdk/build_jss_r.sh b/android/sdk/build_jss_r.sh
new file mode 100755
index 0000000..7334cd3
--- /dev/null
+++ b/android/sdk/build_jss_r.sh
@@ -0,0 +1,24 @@
+echo "--> # buils jsc_runtime so"
+
+
+../gradlew assembleRelease -PbuildRuntimeApi=true
+
+
+echo "--> ## cp jss_runtime so"
+
+unzip -o build/outputs/aar/weex_sdk-release.aar -d build/outputs/aar/weex_sdk-release
+
+
+cp build/outputs/aar/weex_sdk-release/jni/armeabi-v7a/libweexjss.so libs/armeabi-v7a/libweexjssr.so
+cp build/outputs/aar/weex_sdk-release/jni/arm64-v8a/libweexjss.so libs/arm64-v8a/libweexjssr.so
+cp build/outputs/aar/weex_sdk-release/jni/x86/libweexjss.so libs/x86/libweexjssr.so
+
+
+echo "--> ## cp jss_runtime Symbol so"
+
+rm -rf unstrippedSo
+mkdir unstrippedSo
+
+cp build/unstrippedSo/armeabi-v7a_libweexjss.so unstrippedSo/armeabi-v7a_libweexjssr.so
+cp build/unstrippedSo/arm64-v8a_libweexjss.so unstrippedSo/arm64-v8a_libweexjssr.so
+cp build/unstrippedSo/x86_libweexjss.so unstrippedSo/x86_libweexjssr.so
\ No newline at end of file
diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
index 860eeb2..e17adef 100644
--- a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
+++ b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
@@ -315,6 +315,7 @@ public class WXInstanceApm {
addProperty(KEY_PROPERTIES_ERROR_CODE, VALUE_ERROR_CODE_DEFAULT);
addProperty(KEY_PAGE_PROPERTIES_JSLIB_VERSION, WXEnvironment.JS_LIB_SDK_VERSION);
addProperty(KEY_PAGE_PROPERTIES_WEEX_VERSION, WXEnvironment.WXSDK_VERSION);
+ addProperty("wxUseRuntimeApi",WXEnvironment.sUseRunTimeApi);
if (instance != null && (instance.getRenderStrategy() == WXRenderStrategy.DATA_RENDER
|| instance.getRenderStrategy() == WXRenderStrategy.DATA_RENDER_BINARY)) {
addProperty(KEY_PAGE_PROPERTIES_RENDER_TYPE, WXEnvironment.EAGLE);
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
index 70acf60..5581ad9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
@@ -155,10 +155,11 @@ public class WXExceptionUtils {
Map<String, String> commitMap = extParams;
if (null == commitMap){
commitMap = new HashMap<>();
- commitMap.put("wxSdkInitStartTime", String.valueOf(WXEnvironment.sSDKInitStart));
- commitMap.put("wxSDKInitCostTime", String.valueOf(WXEnvironment.sSDKInitTime));
- commitMap.put("wxSDKCurExceptionTime", String.valueOf(System.currentTimeMillis()));
}
+ commitMap.put("wxSdkInitStartTime", String.valueOf(WXEnvironment.sSDKInitStart));
+ commitMap.put("wxSDKInitCostTime", String.valueOf(WXEnvironment.sSDKInitTime));
+ commitMap.put("wxSDKCurExceptionTime", String.valueOf(System.currentTimeMillis()));
+ commitMap.put("wxUseRuntimeApi",String.valueOf(WXEnvironment.sUseRunTimeApi));
if (!TextUtils.isEmpty(instanceId)) {
instanceIdCommit = instanceId;
instance = WXSDKManager.getInstance().getAllInstanceMap().get(instanceId);
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index c6b4dc1..ddceb30 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("Start JS Framework 0.29.6, Build at 2019-04-08 17:04. (Vue: 2.5.16-weex.5, Rax: 0.4.20)");var global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(0,function(){"use strict";var t,c,r,l;function e(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function n(e,t){return e(t={ex [...]
-//# sourceMappingURL=weex-js-framework.min.js.map
+(this.nativeLog||function(e){console.log(e)})("Start JS Framework 0.29.7, Build at 2019-06-10 17:34. (Vue: 2.5.16-weex.5, Rax: 0.4.20)");var global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(0,function(){"use strict";var t,c,r,l;function e(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function n(e,t){return e(t={ex [...]
+//# sourceMappingURL=weex-js-framework.min.js.map
\ No newline at end of file