YorkShen closed pull request #1610: * [android] Support miniapp debug
URL: https://github.com/apache/incubator-weex/pull/1610
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/android/sdk/libs/armeabi-v7a/libweexcore.so
b/android/sdk/libs/armeabi-v7a/libweexcore.so
index dcd049243e..854d71feaf 100644
Binary files a/android/sdk/libs/armeabi-v7a/libweexcore.so and
b/android/sdk/libs/armeabi-v7a/libweexcore.so differ
diff --git a/android/sdk/libs/armeabi/libweexcore.so
b/android/sdk/libs/armeabi/libweexcore.so
index 602f9b7483..9f540a72ef 100644
Binary files a/android/sdk/libs/armeabi/libweexcore.so and
b/android/sdk/libs/armeabi/libweexcore.so differ
diff --git a/android/sdk/libs/x86/libweexcore.so
b/android/sdk/libs/x86/libweexcore.so
index 669a14ffa1..bee91b96e4 100644
Binary files a/android/sdk/libs/x86/libweexcore.so and
b/android/sdk/libs/x86/libweexcore.so differ
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
b/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
index 20f53465ac..c998fe5da1 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java
@@ -18,15 +18,11 @@
*/
package com.taobao.weex.common;
-import com.taobao.weex.WXEnvironment;
-import com.taobao.weex.base.CalledByNative;
import com.taobao.weex.bridge.ResultCallback;
-import com.taobao.weex.bridge.WXBridgeManager;
import com.taobao.weex.bridge.WXJSObject;
import com.taobao.weex.bridge.WXParams;
import com.taobao.weex.dom.CSSShorthand;
import com.taobao.weex.layout.ContentBoxMeasurement;
-
import java.util.HashMap;
import java.util.HashSet;
diff --git a/weex_core/Source/android/wrap/wml_bridge.cpp
b/weex_core/Source/android/wrap/wml_bridge.cpp
index 2113138d0f..c683c03dfe 100644
--- a/weex_core/Source/android/wrap/wml_bridge.cpp
+++ b/weex_core/Source/android/wrap/wml_bridge.cpp
@@ -188,22 +188,22 @@ const char kWMLBridgeClassPath[] =
"com/taobao/windmill/bridge/WMLBridge";
jclass g_WMLBridge_clazz = nullptr;
static JNINativeMethod gWMMethods[] = {
- {"initAppFramework",
+ {"nativeInitAppFramework",
"(Ljava/lang/String;Ljava/lang/String;[Lcom/taobao/weex/bridge/"
"WXJSObject;)I",
(void*)InitAppFramework},
- {"createAppContext",
+ {"nativeCreateAppContext",
"(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)I",
(void*)CreateAppContext},
- {"execJsOnApp",
+ {"nativeExecJsOnApp",
"(Ljava/lang/String;Ljava/lang/String;"
"[Lcom/taobao/weex/bridge/WXJSObject;)I",
(void*)ExecJsOnApp},
- {"execJsOnAppWithResult",
+ {"nativeExecJsOnAppWithResult",
"(Ljava/lang/String;Ljava/lang/String;"
"Ljava/util/Map;)[B",
(void*)ExecJsOnAppWithResult},
- {"destoryAppContext", "(Ljava/lang/String;)I", (void*)DestoryAppContext},
+ {"nativeDestoryAppContext", "(Ljava/lang/String;)I",
(void*)DestoryAppContext},
};
static int registerWMLBridgeNativeMethods(JNIEnv* env, JNINativeMethod*
methods,
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
