Skip to content

Commit

Permalink
Use reference Yoga build
Browse files Browse the repository at this point in the history
Summary: This makes React Native use `libyogacore` as provided by Yoga's reference CMake build. This in turn matches Yoga in the OSS RN build to the same compilation settings we use internally.

Differential Revision: D45764537

fbshipit-source-id: f7edde386ff8336f0337a9f0b165174a10ae620c
  • Loading branch information
NickGerleman authored and facebook-github-bot committed May 11, 2023
1 parent a579019 commit b931573
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 27 deletions.
10 changes: 5 additions & 5 deletions packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ add_react_third_party_ndk_subdir(folly)
add_react_third_party_ndk_subdir(jsc)

# Common targets
add_react_common_subdir(yoga)
add_react_common_subdir(yoga/yoga)
add_react_common_subdir(runtimeexecutor)
add_react_common_subdir(reactperflogger)
add_react_common_subdir(logger)
Expand Down Expand Up @@ -166,17 +166,17 @@ add_executable(reactnative_unittest
${REACT_COMMON_DIR}/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
${REACT_COMMON_DIR}/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp
${REACT_COMMON_DIR}/react/renderer/uimanager/tests/FabricUIManagerTest.cpp

########## (COMPILE BUT FAIL ON ASSERTS) ###########
# ${REACT_COMMON_DIR}/react/renderer/animations/tests/LayoutAnimationTest.cpp
# ${REACT_COMMON_DIR}/react/renderer/mounting/tests/MountingTest.cpp
# ${REACT_COMMON_DIR}/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp

########## (COMPILE BUT FAIL WITH RUNTIME EXCEPTIONS) ###########
# ${REACT_COMMON_DIR}/hermes/inspector/chrome/tests/ConnectionDemuxTests.cpp
# ${REACT_COMMON_DIR}/hermes/inspector/detail/tests/SerialExecutorTests.cpp
# ${REACT_COMMON_DIR}/hermes/inspector/tests/InspectorTests.cpp

########## (DO NOT COMPILE) ###########
# ${REACT_COMMON_DIR}/react/renderer/core/tests/ShadowNodeTest.cpp
# ${REACT_COMMON_DIR}/react/renderer/core/tests/ConcreteShadowNodeTest.cpp
Expand All @@ -196,7 +196,7 @@ add_executable(reactnative_unittest
target_link_libraries(reactnative_unittest
folly_runtime
folly_futures
glog
glog
glog_init
gtest
hermes-engine::libhermes
Expand Down
22 changes: 0 additions & 22 deletions packages/react-native/ReactCommon/yoga/CMakeLists.txt

This file was deleted.

0 comments on commit b931573

Please sign in to comment.