Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5cc1ffa2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5cc1ffa2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5cc1ffa2 Branch: refs/heads/master Commit: 5cc1ffa29c3fc8426415e522e622fc9d05eed0cf Parents: 3612f7f c6754e6 Author: sunsky6 <suenyin...@163.com> Authored: Tue Feb 6 11:27:18 2018 +0800 Committer: sunsky6 <suenyin...@163.com> Committed: Tue Feb 6 11:27:18 2018 +0800 ---------------------------------------------------------------------- android/sdk/libs/x86/libweexjsb.so | Bin 0 -> 3212 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12126020 -> 649940 bytes android/sdk/libs/x86/libweexjss.so | Bin 0 -> 10942128 bytes .../main/java/com/taobao/weex/WXSDKEngine.java | 1 + .../taobao/weex/bridge/WXServiceManager.java | 25 +++++++++++++------ ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +- .../Sources/Model/WXSDKInstance_private.h | 3 ++- 7 files changed, 21 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
