From 47717324d490cd703f4e0e7b598e4a39a212f72a Mon Sep 17 00:00:00 2001
From: Sidharth Guglani <sidharthguglani@fb.com>
Date: Sun, 15 Sep 2019 13:50:56 -0700
Subject: [PATCH] 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
---
 testutil/build.gradle                |  1 +
 testutil/src/main/cpp/CMakeLists.txt | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/testutil/build.gradle b/testutil/build.gradle
index 47074284..5ec4134a 100644
--- a/testutil/build.gradle
+++ b/testutil/build.gradle
@@ -29,6 +29,7 @@ android {
     externalNativeBuild {
         cmake {
             path 'src/main/cpp/CMakeLists.txt'
+            version '3.6.0-rc2'
         }
     }
 
diff --git a/testutil/src/main/cpp/CMakeLists.txt b/testutil/src/main/cpp/CMakeLists.txt
index 2330f8e3..71f09e86 100644
--- a/testutil/src/main/cpp/CMakeLists.txt
+++ b/testutil/src/main/cpp/CMakeLists.txt
@@ -9,6 +9,18 @@ cmake_minimum_required(VERSION 3.4.1)
 
 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(
     -fno-omit-frame-pointer
     -fexceptions
@@ -26,5 +38,8 @@ add_library(testutil SHARED
 
 target_include_directories(testutil PRIVATE
     include)
+target_include_directories(testutil PRIVATE
+    ${libfb_DIR}/include
+    ${yogacore_DIR})
 
-target_link_libraries(testutil android log)
+target_link_libraries(testutil yogacore fb)