fix fbjni and yoga event files not found in testutil issue
Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/928 Reviewed By: amir-shalem Differential Revision: D17383979 fbshipit-source-id: 755c2cc3749d5e23fbd1e0ac7a41632c1400ae24
This commit is contained in:
committed by
Facebook Github Bot
parent
1043c35f2b
commit
47717324d4
@@ -29,6 +29,7 @@ android {
|
|||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
path 'src/main/cpp/CMakeLists.txt'
|
path 'src/main/cpp/CMakeLists.txt'
|
||||||
|
version '3.6.0-rc2'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9,6 +9,18 @@ cmake_minimum_required(VERSION 3.4.1)
|
|||||||
|
|
||||||
set(CMAKE_VERBOSE_MAKEFILE on)
|
set(CMAKE_VERBOSE_MAKEFILE on)
|
||||||
|
|
||||||
|
set(libfb_DIR ${CMAKE_SOURCE_DIR}/../../../../lib/fb/src/main/cpp)
|
||||||
|
set(yogacore_DIR ${CMAKE_SOURCE_DIR}/../../../..)
|
||||||
|
set(build_DIR ${CMAKE_SOURCE_DIR}/build)
|
||||||
|
|
||||||
|
set(libfb_build_DIR ${build_DIR}/libfb/${ANDROID_ABI})
|
||||||
|
set(yogacore_build_DIR ${build_DIR}/yogacore/${ANDROID_ABI})
|
||||||
|
|
||||||
|
file(MAKE_DIRECTORY ${build_DIR})
|
||||||
|
|
||||||
|
add_subdirectory(${libfb_DIR} ${libfb_build_DIR})
|
||||||
|
add_subdirectory(${yogacore_DIR} ${yogacore_build_DIR})
|
||||||
|
|
||||||
add_compile_options(
|
add_compile_options(
|
||||||
-fno-omit-frame-pointer
|
-fno-omit-frame-pointer
|
||||||
-fexceptions
|
-fexceptions
|
||||||
@@ -26,5 +38,8 @@ add_library(testutil SHARED
|
|||||||
|
|
||||||
target_include_directories(testutil PRIVATE
|
target_include_directories(testutil PRIVATE
|
||||||
include)
|
include)
|
||||||
|
target_include_directories(testutil PRIVATE
|
||||||
|
${libfb_DIR}/include
|
||||||
|
${yogacore_DIR})
|
||||||
|
|
||||||
target_link_libraries(testutil android log)
|
target_link_libraries(testutil yogacore fb)
|
||||||
|
Reference in New Issue
Block a user