Repository: incubator-weex Updated Branches: refs/heads/master dba210456 -> e70f2e0c5
* [core] rm jni code from weexcore * [core] use CMAKE_CXX_FLAGS replace CMAKE_CXX_FLAGS see:https://blog.csdn.net/10km/article/details/51731959 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4eb7c0e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4eb7c0e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4eb7c0e7 Branch: refs/heads/master Commit: 4eb7c0e7481965eb9a59c93182181877cb3813cb Parents: 19a2429 Author: zhongcang <qh438406...@gmail.com> Authored: Mon Jun 4 17:33:47 2018 +0800 Committer: zhongcang <qh438406...@gmail.com> Committed: Mon Jun 4 17:51:46 2018 +0800 ---------------------------------------------------------------------- weex_core/Source/CMakeLists.txt | 16 +++++++--------- .../native_render_object_utils_impl_android.cpp | 1 + weex_core/Source/core/parser/dom_wson.cpp | 1 - .../render_action_appendtree_createfinish.cpp | 4 ++-- weex_core/Source/core/render/node/render_appbar.h | 2 +- weex_core/Source/core/render/node/render_list.h | 1 - weex_core/Source/core/render/node/render_mask.h | 1 - weex_core/Source/core/render/node/render_object.h | 2 -- weex_core/Source/core/render/node/render_scroller.h | 1 - weex_core/Source/core/render/page/render_page.cpp | 1 - weex_core/Source/core/render/page/render_page.h | 1 - 11 files changed, 11 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/weex_core/Source/CMakeLists.txt b/weex_core/Source/CMakeLists.txt index ce49a55..d0ef00c 100644 --- a/weex_core/Source/CMakeLists.txt +++ b/weex_core/Source/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.4.1) set(WEEXCORE_LIBRARY_NAME weexcore) -add_compile_options(-std=c++11) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +#add_compile_options(-std=c++11) add_compile_options(-fexceptions) add_definitions(-DGNU_SUPPORT=1) @@ -42,20 +43,21 @@ set(COMMON_SRCS ./core/moniter/render_performance.cpp ./core/manager/weex_core_manager.cpp ./core/bridge/js_bridge.cpp + ./core/parser/dom_wson.cpp ) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/wson) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wson) SET(FINAL_ADD_LIBRARY ${COMMON_SRCS} ) -SET(FINAL_TARGET_LINK_LIBRARIES ) +SET(FINAL_TARGET_LINK_LIBRARIES wson) if (ANDROID) ## add_subdirectory for subdirectory has a CMakeLists.txt add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/IPC) ## include_directories for include head file include_directories(${CMAKE_CURRENT_SOURCE_DIR}/IPC) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/wson) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wson) set (ANDROID_SRCS ./android/jniprebuild/jni_load.cc @@ -79,7 +81,6 @@ if (ANDROID) ./android/jsengine/multiprocess/ExtendJSApi.cpp - ./core/parser/dom_wson.cpp ./android/jsengine/api/WeexJSCoreApi.cpp @@ -100,9 +101,6 @@ if (ANDROID) endif (ANDROID) -add_library(${WEEXCORE_LIBRARY_NAME} SHARED - ${FINAL_ADD_LIBRARY} - ) - +add_library(${WEEXCORE_LIBRARY_NAME} SHARED ${FINAL_ADD_LIBRARY}) target_include_directories(${WEEXCORE_LIBRARY_NAME} PUBLIC .) target_link_libraries(${WEEXCORE_LIBRARY_NAME} ${FINAL_TARGET_LINK_LIBRARIES}) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/android/bridge/impl/native_render_object_utils_impl_android.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/android/bridge/impl/native_render_object_utils_impl_android.cpp b/weex_core/Source/android/bridge/impl/native_render_object_utils_impl_android.cpp index 493015b..dbf28a8 100644 --- a/weex_core/Source/android/bridge/impl/native_render_object_utils_impl_android.cpp +++ b/weex_core/Source/android/bridge/impl/native_render_object_utils_impl_android.cpp @@ -28,6 +28,7 @@ #include <core/render/node/factory/render_type.h> #include <android/log.h> #include <core/render/node/render_list.h> +#include <android/base/log_utils.h> using namespace WeexCore; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/parser/dom_wson.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/parser/dom_wson.cpp b/weex_core/Source/core/parser/dom_wson.cpp index 36ea3c3..46adcd9 100644 --- a/weex_core/Source/core/parser/dom_wson.cpp +++ b/weex_core/Source/core/parser/dom_wson.cpp @@ -20,7 +20,6 @@ // Created by furture on 2018/5/15. // -#include <jni.h> #include <core/render/node/render_object.h> #include <core/render/page/render_page.h> #include <core/render/node/factory/render_creator.h> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp index 42d3d49..e7b3999 100644 --- a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp +++ b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp @@ -17,7 +17,7 @@ * under the License. */ #include "render_action_appendtree_createfinish.h" -#include "../../../android/bridge/impl/bridge_impl_android.h" +#include <core/manager/weex_core_manager.h> namespace WeexCore { @@ -27,6 +27,6 @@ namespace WeexCore { } void RenderActionAppendTreeCreateFinish::ExecuteAction() { - Bridge_Impl_Android::getInstance()->callAppendTreeCreateFinish(mPageId.c_str(), mRef.c_str()); + WeexCoreManager::getInstance()->getPlatformBridge()->callAppendTreeCreateFinish(mPageId.c_str(), mRef.c_str()); } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/node/render_appbar.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_appbar.h b/weex_core/Source/core/render/node/render_appbar.h index 9795de6..ba58d3b 100644 --- a/weex_core/Source/core/render/node/render_appbar.h +++ b/weex_core/Source/core/render/node/render_appbar.h @@ -21,7 +21,7 @@ #include <core/render/node/render_object.h> #include <string> -#include <android/base/string/string_utils.h> +//#include <android/base/string/string_utils.h> namespace WeexCore { class RenderAppBar : public RenderObject { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/node/render_list.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_list.h b/weex_core/Source/core/render/node/render_list.h index ab22409..738e4ea 100644 --- a/weex_core/Source/core/render/node/render_list.h +++ b/weex_core/Source/core/render/node/render_list.h @@ -22,7 +22,6 @@ #include <core/css/constants_name.h> #include <core/render/node/render_object.h> #include <core/css/constants_value.h> -#include <android/base/log_utils.h> #include <cmath> #include <base/ViewUtils.h> #include <core/render/node/factory/render_type.h> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/node/render_mask.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_mask.h b/weex_core/Source/core/render/node/render_mask.h index da7250a..568e759 100644 --- a/weex_core/Source/core/render/node/render_mask.h +++ b/weex_core/Source/core/render/node/render_mask.h @@ -21,7 +21,6 @@ #include <core/render/node/render_object.h> #include <core/config/core_environment.h> -#include <android/bridge/impl/bridge_impl_android.h> #include <base/ViewUtils.h> #include <cstdlib> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/node/render_object.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_object.h b/weex_core/Source/core/render/node/render_object.h index ca1cf93..758c3f1 100644 --- a/weex_core/Source/core/render/node/render_object.h +++ b/weex_core/Source/core/render/node/render_object.h @@ -22,7 +22,6 @@ #include <string> #include <map> #include <set> -#include <jni.h> #include <core/css/constants_name.h> #include <core/css/css_value_getter.h> #include <core/layout/layout.h> @@ -31,7 +30,6 @@ #include <base/ViewUtils.h> #include <core/render/page/render_page.h> #include <core/css/constants_value.h> -#include <android/base/log_utils.h> #include <functional> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/node/render_scroller.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_scroller.h b/weex_core/Source/core/render/node/render_scroller.h index f5052d9..38e804a 100644 --- a/weex_core/Source/core/render/node/render_scroller.h +++ b/weex_core/Source/core/render/node/render_scroller.h @@ -19,7 +19,6 @@ #ifndef WEEX_PROJECT_RENDERSCROLLER_H #define WEEX_PROJECT_RENDERSCROLLER_H -#include <android/bridge/impl/bridge_impl_android.h> #include <core/render/node/render_object.h> namespace WeexCore { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/page/render_page.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/page/render_page.cpp b/weex_core/Source/core/render/page/render_page.cpp index 85016e9..cc2b4c9 100644 --- a/weex_core/Source/core/render/page/render_page.cpp +++ b/weex_core/Source/core/render/page/render_page.cpp @@ -26,7 +26,6 @@ #include <core/render/action/render_action_createfinish.h> #include <core/render/action/render_action_appendtree_createfinish.h> #include <core/layout/layout.h> -#include <android/base/string/string_utils.h> #include <core/moniter/render_performance.h> #include <core/config/core_environment.h> #include <base/ViewUtils.h> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4eb7c0e7/weex_core/Source/core/render/page/render_page.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/page/render_page.h b/weex_core/Source/core/render/page/render_page.h index dacda5a..fce095f 100644 --- a/weex_core/Source/core/render/page/render_page.h +++ b/weex_core/Source/core/render/page/render_page.h @@ -22,7 +22,6 @@ #include <vector> #include <string> #include <map> -#include <jni.h> #include <cmath> #include <atomic>