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

Remove vendored copy of fbjni (#530)

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

Use the pre-release of fbjni instead of our bundled copy. I hope this can be made a little less awkward, but it works for now.

Reviewed By: jknoxville

Differential Revision: D16988077

fbshipit-source-id: 936e414f9b2bf82ccb54b107228d79d01acdbf14
This commit is contained in:
Pascal Hartig
2019-09-03 06:04:16 -07:00
committed by Facebook Github Bot
parent 6f14bb7dfa
commit 4544c4fff1
65 changed files with 54 additions and 8317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/CMakeLists.txt
View File

@@ -31,7 +31,6 @@ add_library(${PACKAGE_NAME} SHARED ${SOURCES})
target_include_directories(${PACKAGE_NAME} PUBLIC "./")
set(libjnihack_DIR ${CMAKE_SOURCE_DIR}/../libs/jni-hack/)
set(libfbjni_DIR ${CMAKE_SOURCE_DIR}/../libs/fbjni/)
set(libflipper_DIR ${CMAKE_SOURCE_DIR}/../xplat/)
set(external_DIR ${PROJECT_SOURCE_DIR}/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/)
@@ -41,21 +40,22 @@ set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-release-2.1.9/)
set(build_DIR ${CMAKE_SOURCE_DIR}/build)
set(fbjni_build_DIR ${build_DIR}/fbjni/${ANDROID_ABI})
set(libflipper_build_DIR ${build_DIR}/libflipper/${ANDROID_ABI})
set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})
file(MAKE_DIRECTORY ${build_DIR})
file(GLOB libfbjni_link_DIRS "${build_DIR}/fbjni*/jni/${ANDROID_ABI}")
file(GLOB libfbjni_include_DIRS "${build_DIR}/fbjni-*-headers.jar/")
# Without NO_CMAKE_FIND_ROOT_PATH, this will for some bizarre reason only look
# in the NDK folder.
find_library(FBJNI_LIBRARY fbjni PATHS ${libfbjni_link_DIRS} NO_CMAKE_FIND_ROOT_PATH)
add_subdirectory(${libflipper_DIR} ${libflipper_build_DIR})
add_subdirectory(${libfbjni_DIR} ${fbjni_build_DIR})
target_include_directories(${PACKAGE_NAME} PRIVATE
${libjnihack_DIR}
${libfbjni_DIR}/cxx/
${libfbjni_DIR}/cxx/fbjni
${libfbjni_DIR}/cxx/fbjni/detail
${libfbjni_DIR}/cxx/lyra
${libfbjni_include_DIRS}
${libflipper_DIR}
${libfolly_DIR}
${glog_DIR}
@@ -68,4 +68,4 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
${LIBEVENT_DIR}/include/event2
)
target_link_libraries(${PACKAGE_NAME} flipperfb flippercpp)
target_link_libraries(${PACKAGE_NAME} ${FBJNI_LIBRARY} flippercpp)