Merge branch 'core-feature-wson-build' of https://github.com/lucky-ch…

…en/incubator-weex

This closes #1210

weex_core/Source/CMakeLists.txt

@@ -14,12 +14,6 @@ add_definitions(-DLAYOUT_LOG=0)
 add_definitions(-DJSAPI_LOG=0)
 add_definitions(-DDOM_PARSER_LOG=0)
 
-## 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)
-
 set(COMMON_SRCS
   ./core/api/WeexJSCoreApi.cpp
 
@@ -50,10 +44,14 @@ set(COMMON_SRCS
 )
 
 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
-    ./wson/wson.c
-    ./wson/wson_util.cpp
-    ./wson/wson_parser.cpp
     ./android/jniprebuild/jni_load.cc
     ./android/base/jni/android_jni.cpp
     ./android/base/jni/scoped_java_ref.cpp
@@ -86,5 +84,5 @@ if (ANDROID)
 
   target_include_directories(${WEEXCORE_LIBRARY_NAME} PUBLIC .)
 
-  target_link_libraries(${WEEXCORE_LIBRARY_NAME} android weexipc log z)
+  target_link_libraries(${WEEXCORE_LIBRARY_NAME} wson android weexipc log z)
 endif (ANDROID)

weex_core/Source/wson/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+set(WSON_LIBRARY_NAME wson)
+
+add_library(${WSON_LIBRARY_NAME} STATIC
+  ./wson.c
+  ./wson_util.cpp
+  ./wson_parser.cpp
+)
+
+target_include_directories(${WSON_LIBRARY_NAME} PUBLIC .)