zshshr closed pull request #1468: run weex in multiprogress only
URL: https://github.com/apache/incubator-weex/pull/1468
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/libJavaScriptCore.so
b/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so
index 904fdc7782..1f74471cde 100755
Binary files a/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so and
b/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so differ
diff --git a/android/sdk/libs/armeabi-v7a/libweexjss.so
b/android/sdk/libs/armeabi-v7a/libweexjss.so
index 5880ebd75f..2c5dae5968 100755
Binary files a/android/sdk/libs/armeabi-v7a/libweexjss.so and
b/android/sdk/libs/armeabi-v7a/libweexjss.so differ
diff --git a/android/sdk/libs/armeabi/libJavaScriptCore.so
b/android/sdk/libs/armeabi/libJavaScriptCore.so
index 904fdc7782..1f74471cde 100755
Binary files a/android/sdk/libs/armeabi/libJavaScriptCore.so and
b/android/sdk/libs/armeabi/libJavaScriptCore.so differ
diff --git a/android/sdk/libs/armeabi/libweexjss.so
b/android/sdk/libs/armeabi/libweexjss.so
index 5880ebd75f..2c5dae5968 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and
b/android/sdk/libs/armeabi/libweexjss.so differ
diff --git a/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp
b/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp
index daa1d4f53d..c367182977 100644
--- a/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp
+++ b/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp
@@ -289,26 +289,26 @@ namespace WeexCore {
return false;
LOGE("Single process ? %s", g_use_single_process ? "true" : "false");
- if (g_use_single_process) {
- if (initFrameworkInSingleProcess(env, script,
initFrameworkParams)) {
- //reportNativeInitStatus("-1011", "init Single Process
Success");
- return true;
- }
-
- if (initFrameworkInMultiProcess(env, script, params,
serializer.get())) {
- return true;
- }
- } else {
- if (initFrameworkInMultiProcess(env, script, params,
serializer.get())) {
- return true;
- }
-
- if (initFrameworkInSingleProcess(env, script,
initFrameworkParams)) {
- reportNativeInitStatus("-1011", "init Single Process Success");
- return true;
- }
+// if (g_use_single_process) {
+// if (initFrameworkInSingleProcess(env, script,
initFrameworkParams)) {
+// //reportNativeInitStatus("-1011", "init Single Process
Success");
+// return true;
+// }
+//
+// if (initFrameworkInMultiProcess(env, script, params,
serializer.get())) {
+// return true;
+// }
+// } else {
+ if (initFrameworkInMultiProcess(env, script, params,
serializer.get())) {
+ return true;
}
+// if (initFrameworkInSingleProcess(env, script,
initFrameworkParams)) {
+// reportNativeInitStatus("-1011", "init Single Process
Success");
+// return true;
+// }
+// }
+
reportNativeInitStatus("-1010", "init Failed");
return false;
}
----------------------------------------------------------------
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
