jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rsocket version (#225)

Browse Source 
Summary:
Updates rsocket to latest version
Pull Request resolved: https://github.com/facebook/flipper/pull/225

Reviewed By: jknoxville

Differential Revision: D9313576

Pulled By: priteshrnandgaonkar

fbshipit-source-id: afd55eddfa79f0f9d2a36a6f0539d823161d1bed
This commit is contained in:
Pritesh Nandgaonkar
2018-08-14 05:45:01 -07:00
committed by Facebook Github Bot
parent 6f2a7dcb05
commit 3a584d0f18
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/third-party/native.gradle vendored
View File

@@ -181,7 +181,7 @@ task finalizeOpenSSL(dependsOn: [configureOpenSSL], type: Exec) {
} }
task downloadRSocket(dependsOn: [], type: Download) { task downloadRSocket(dependsOn: [], type: Download) {
src 'https://github.com/priteshrnandgaonkar/rsocket-cpp/archive/0.10.1.tar.gz' src 'https://github.com/priteshrnandgaonkar/rsocket-cpp/archive/0.10.2.tar.gz'
onlyIfNewer true onlyIfNewer true
overwrite false overwrite false
dest new File(downloadsDir, 'rsocket-' + getDownloadFileName(src)) dest new File(downloadsDir, 'rsocket-' + getDownloadFileName(src))
@@ -190,7 +190,7 @@ task downloadRSocket(dependsOn: [], type: Download) {
task prepareRSocket(dependsOn: [downloadRSocket], type: Copy) { task prepareRSocket(dependsOn: [downloadRSocket], type: Copy) {
from tarTree(downloadRSocket.dest) from tarTree(downloadRSocket.dest)
from './overrides/RSocket/' from './overrides/RSocket/'
include 'rsocket-cpp-0.10.1/**/*', 'build.gradle', 'ApplicationManifest.xml', 'CMakeLists.txt' include 'rsocket-cpp-0.10.2/**/*', 'build.gradle', 'ApplicationManifest.xml', 'CMakeLists.txt'
includeEmptyDirs = false includeEmptyDirs = false
into "$externalDir/RSocket" into "$externalDir/RSocket"
} }

5
android/third-party/overrides/RSocket/CMakeLists.txt vendored
View File

@@ -2,6 +2,7 @@ cmake_minimum_required (VERSION 3.6.0)
PROJECT(rsocket CXX) PROJECT(rsocket CXX)
set(PACKAGE_NAME rsocket) set(PACKAGE_NAME rsocket)
set(RSOCKET_VERSION 0.10.2)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
@@ -13,8 +14,8 @@ 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(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/)
set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-1.1.0h/) set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-1.1.0h/)
set(RSOCKET_ROOT_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-0.10.1) set(RSOCKET_ROOT_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-${RSOCKET_VERSION})
set(RSOCKET_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-0.10.1/rsocket) set(RSOCKET_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-${RSOCKET_VERSION}/rsocket)
list(APPEND dir_list ${RSOCKET_ROOT_DIR}/) list(APPEND dir_list ${RSOCKET_ROOT_DIR}/)
list(APPEND dir_list ${RSOCKET_DIR}/) list(APPEND dir_list ${RSOCKET_DIR}/)

1
android/third-party/overrides/RSocket/build.gradle vendored
View File

@@ -24,7 +24,6 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path './CMakeLists.txt' path './CMakeLists.txt'
//'rsocket-cpp-0.10.0/CMakeLists.txt'
} }
} }
} }

4
xplat/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
set(PACKAGE_NAME sonarcpp) set(PACKAGE_NAME sonarcpp)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(RSOCKET_VERSION 0.10.2)
set(external_DIR ${PROJECT_SOURCE_DIR}/../android/third-party/external) set(external_DIR ${PROJECT_SOURCE_DIR}/../android/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/) set(libfolly_DIR ${external_DIR}/folly/)
set(rsocket_DIR ${external_DIR}/RSocket/) set(rsocket_DIR ${external_DIR}/RSocket/)
@@ -58,7 +58,7 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
${BOOST_DIR} ${BOOST_DIR}
${BOOST_DIR}/../ ${BOOST_DIR}/../
${LIBEVENT_DIR}/ ${LIBEVENT_DIR}/
${rsocket_DIR}/rsocket-cpp-0.10.1 ${rsocket_DIR}/rsocket-cpp-${RSOCKET_VERSION}
${LIBEVENT_DIR}/include/ ${LIBEVENT_DIR}/include/
${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2
${OPENSSL_DIR}/include ${OPENSSL_DIR}/include