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

Bump Folly dependency for Android (#463)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/463

Was made aware [here](https://github.com/facebook/flipper/issues/461) that
we currently don't build with NDK 20 because of Folly. The above issue exists only for x86 platform and not for other platform. I have updated the folly and RSocket. Although this diff doesn't solve the issue mentioned above for x86, but it updates the dependencies to the latest version. To mitigate temporarily, I have updated the gradle to not build for x86.

Reviewed By: passy

Differential Revision: D15713205

fbshipit-source-id: 79dd5825b0b876c87a1868fde8f3353a76012267
This commit is contained in:
Pritesh Nandgaonkar
2019-06-12 03:36:07 -07:00
committed by Facebook Github Bot
parent 173ce43192
commit 7d8db465e1
6 changed files with 229 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xplat/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
set(PACKAGE_NAME flippercpp)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF)
set(RSOCKET_VERSION 0.10.3)
set(RSOCKET_VERSION 0.10.7)
set(external_DIR ${PROJECT_SOURCE_DIR}/../android/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/)
set(rsocket_DIR ${external_DIR}/RSocket/)