Repository: incubator-weex Updated Branches: refs/heads/master dddd0f427 -> d01f1086a
[WEEX-399][Android] remove extra api js remove extra api js Bug: WEEX-399 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d01f1086 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d01f1086 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d01f1086 Branch: refs/heads/master Commit: d01f1086ae718239c6f389f590b19afde8a3f1c9 Parents: dddd0f4 Author: ä¸ç <[email protected]> Authored: Wed May 23 22:48:41 2018 +0800 Committer: ä¸ç <[email protected]> Committed: Wed May 23 22:48:41 2018 +0800 ---------------------------------------------------------------------- android/sdk/build.gradle | 10 +++---- .../com/taobao/weex/bridge/WXBridgeManager.java | 28 ++++---------------- 2 files changed, 10 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d01f1086/android/sdk/build.gradle ---------------------------------------------------------------------- diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 85df919..ea4185f 100755 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -72,11 +72,11 @@ android { include 'weex-rax-api.js' } - copy { - from '../../pre-build' - into new File(projectDir,"assets") - include 'weex-rax-extra-api.js' - } +// copy { +// from '../../pre-build' +// into new File(projectDir,"assets") +// include 'weex-rax-extra-api.js' +// } if(project.hasProperty('asfRelease')){ //download so file if not exist, when compile in source release http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d01f1086/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java index d42f059..4415fd7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java @@ -170,7 +170,7 @@ public class WXBridgeManager implements Callback, BactchExecutor { private static long lastCrashTime = 0; private static String mRaxApi = null; - private static String mRaxExtApi = null; +// private static String mRaxExtApi = null; // add for clound setting, default value is true // can use it to control weex sandbox @@ -1312,29 +1312,11 @@ public class WXBridgeManager implements Callback, BactchExecutor { WXJSObject apiObj; if (type == BundType.Rax) { - boolean isWindmill = false; - try { - if (options != null) { - String container = (String) options.get("container"); - isWindmill = "windmill".equals(container); - } - } catch (Throwable t) { - t.printStackTrace(); - } - - if (isWindmill) { - if (mRaxExtApi == null) { - mRaxExtApi = WXFileUtils.loadAsset("weex-rax-extra-api.js", WXEnvironment.getApplication()); - } - apiObj = new WXJSObject(WXJSObject.String, - mRaxExtApi); - } else { - if (mRaxApi == null) { - mRaxApi = WXFileUtils.loadAsset("weex-rax-api.js", WXEnvironment.getApplication()); - } - apiObj = new WXJSObject(WXJSObject.String, - mRaxApi); + if (mRaxApi == null) { + mRaxApi = WXFileUtils.loadAsset("weex-rax-api.js", WXEnvironment.getApplication()); } + apiObj = new WXJSObject(WXJSObject.String, + mRaxApi); } else { apiObj = new WXJSObject(WXJSObject.String, "");
