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

openssl from prefab (google) (#3429)

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

Instead of downloading/patching/building openssl, use the prefab package prepared by Google.

changelog: Consume openssl from maven (prefab)

Reviewed By: passy

Differential Revision: D34143349

fbshipit-source-id: 0ca92be6628b1b27a59b3e4ad8278cf8fef6d5d8
This commit is contained in:
Lorenzo Blasa
2022-02-11 02:58:45 -08:00
committed by Facebook GitHub Bot
parent 9973014116
commit c8c40bca17
12 changed files with 35 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/CMakeLists.txt
View File

@@ -41,7 +41,6 @@ set(external_DIR ${PROJECT_SOURCE_DIR}/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/)
set(glog_DIR ${external_DIR}/glog)
set(BOOST_DIR ${external_DIR}/boost/boost_1_63_0/)
set(OPENSSL_DIR ${external_DIR}/OpenSSL/openssl-1.1.1k/)
set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-2.1.11-stable/)
set(build_DIR ${CMAKE_SOURCE_DIR}/build)
@@ -51,6 +50,7 @@ set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})
file(MAKE_DIRECTORY ${build_DIR})
find_package(fbjni REQUIRED CONFIG)
find_package(openssl REQUIRED CONFIG)
add_subdirectory(${libflipper_DIR} ${libflipper_build_DIR})
target_include_directories(${PACKAGE_NAME} PRIVATE
@@ -65,7 +65,6 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
${LIBEVENT_DIR}/
${LIBEVENT_DIR}/include/
${LIBEVENT_DIR}/include/event2
${OPENSSL_DIR}/include
)
target_link_libraries(${PACKAGE_NAME} fbjni::fbjni flippercpp)