Merge pull request #86 from facebook/Fix-Android

[WIP][HELP]Fix android

xplat/CMakeLists.txt

@@ -2,17 +2,22 @@ cmake_minimum_required (VERSION 3.6.0)
 project(sonarcpp CXX)
 set(CMAKE_VERBOSE_MAKEFILE on)
 set(PACKAGE_NAME      sonarcpp)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(third_party_ndk ../android/build/third-party-ndk)
+set(third_party_ndk ${PROJECT_SOURCE_DIR}/../android/build/third-party-ndk)
 set(libfolly_DIR ${third_party_ndk}/folly/)
+set(rsocket_DIR ${third_party_ndk}/RSocket/)
 set(easywsclient_DIR ../libs/)
 set(glog_DIR ${third_party_ndk}/glog)
 set(BOOST_DIR ${third_party_ndk}/boost/boost_1_63_0/)
-
+set(LIBEVENT_DIR ${third_party_ndk}/LibEvent/libevent-release-2.1.9/)
 set(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/)
+set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-android-1.0.0/)
 
 list(APPEND dir_list ./)
 list(APPEND dir_list ./Sonar)
+
 include_directories(${dir_list})
 
 add_compile_options(-DFOLLY_NO_CONFIG
@@ -24,7 +29,6 @@ add_compile_options(-DFOLLY_NO_CONFIG
                     -DFOLLY_HAVE_PREADV=0
                     -frtti
                     -fexceptions
-                    -std=c++14
                     -Wno-error
                     -Wno-unused-local-typedefs
                     -Wno-unused-variable
@@ -40,21 +44,32 @@ add_library(${PACKAGE_NAME} SHARED ${SOURCES})
 
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})
-set(easywsclient_build_DIR ${build_DIR}/easywsclient/${ANDROID_ABI})
+set(rsocket_build_DIR ${build_DIR}/rsocket/${ANDROID_ABI})
 
 file(MAKE_DIRECTORY ${build_DIR})
 
-add_subdirectory(${libfolly_DIR} ${libfolly_build_DIR})
-add_subdirectory(${easywsclient_DIR}/easywsclient ${easywsclient_build_DIR})
+#add_subdirectory(${libfolly_DIR} ${libfolly_build_DIR})
+add_subdirectory(${rsocket_DIR} ${rsocket_build_DIR})
+
+message(STATUS "RSocket DIR:- " ${rsocket_DIR})
 
 target_include_directories(${PACKAGE_NAME} PRIVATE
         ${libfolly_DIR}
         ${BOOST_DIR}
         ${BOOST_DIR}/../
+        ${LIBEVENT_DIR}/
+        ${rsocket_DIR}/rsocket-cpp-0.10.1
+        ${LIBEVENT_DIR}/include/
+        ${LIBEVENT_DIR}/include/event2
+        ${OPENSSL_DIR}/jni/openssl-android/
+        ${OPENSSL_DIR}/jni/openssl-android/include
+        ${OPENSSL_DIR}/jni/openssl-android/include/openssl
         ${glog_DIR}
         ${glog_DIR}/../
         ${glog_DIR}/glog-0.3.5/src/
-        ${easywsclient_DIR}
     )
 
-target_link_libraries(${PACKAGE_NAME}  folly easywsclient glog double-conversion log)
+set(OPENSSL_LINK_DIRECTORIES ${third_party_ndk}/OpenSSL/libs/${ANDROID_ABI}/)
+find_path(OPENSSL_LIBRARY libssl.so HINTS ${OPENSSL_LINK_DIRECTORIES})
+
+target_link_libraries(${PACKAGE_NAME}  folly rsocket glog double-conversion log event ${OPENSSL_LINK_DIRECTORIES}/libssl.so ${OPENSSL_LINK_DIRECTORIES}/libcrypto.so)

xplat/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
 
         ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'arm64-v8a', 'x86'
         }
 
         externalNativeBuild {
@@ -31,7 +31,8 @@ android {
     }
 
     dependencies {
-        implementation project(':easywsclient')
+        implementation project(':rsocket')
         implementation project(':folly')
     }
 }
+//'armeabi-v7a'