From c74f91957e70b6035db14be2dd7629ac532b2c07 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 15 Sep 2022 09:48:25 -0700 Subject: [PATCH] Integrate C++ view managers into RN OSS build system Summary: Customize gradle/buck to be able to build fabric C++ components files changelog: [internal] internal Reviewed By: cortinico, sammy-SC Differential Revision: D39448416 fbshipit-source-id: 3beddf27082728e2316e483c2541c7405e4c57f7 --- ReactAndroid/src/main/jni/CMakeLists.txt | 1 - .../jni/react/fabric/{components => }/Component.h | 0 .../react/fabric/{components => }/ComponentManager.h | 0 .../src/main/jni/react/fabric/components/BUCK | 2 +- .../main/jni/react/fabric/components/CMakeLists.txt | 12 ++++++++++++ 5 files changed, 13 insertions(+), 2 deletions(-) rename ReactAndroid/src/main/jni/react/fabric/{components => }/Component.h (100%) rename ReactAndroid/src/main/jni/react/fabric/{components => }/ComponentManager.h (100%) diff --git a/ReactAndroid/src/main/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/CMakeLists.txt index 3f47b8905e6..3eaf2652ecc 100644 --- a/ReactAndroid/src/main/jni/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/CMakeLists.txt @@ -104,4 +104,3 @@ add_react_android_subdir(src/main/jni/react/fabric) add_react_android_subdir(src/main/jni/react/newarchdefaults) add_react_android_subdir(src/main/jni/react/hermes/reactexecutor) add_react_android_subdir(src/main/jni/react/hermes/instrumentation/) - diff --git a/ReactAndroid/src/main/jni/react/fabric/components/Component.h b/ReactAndroid/src/main/jni/react/fabric/Component.h similarity index 100% rename from ReactAndroid/src/main/jni/react/fabric/components/Component.h rename to ReactAndroid/src/main/jni/react/fabric/Component.h diff --git a/ReactAndroid/src/main/jni/react/fabric/components/ComponentManager.h b/ReactAndroid/src/main/jni/react/fabric/ComponentManager.h similarity index 100% rename from ReactAndroid/src/main/jni/react/fabric/components/ComponentManager.h rename to ReactAndroid/src/main/jni/react/fabric/ComponentManager.h diff --git a/ReactAndroid/src/main/jni/react/fabric/components/BUCK b/ReactAndroid/src/main/jni/react/fabric/components/BUCK index 1c7a0d058dc..d56de6dc03b 100644 --- a/ReactAndroid/src/main/jni/react/fabric/components/BUCK +++ b/ReactAndroid/src/main/jni/react/fabric/components/BUCK @@ -32,12 +32,12 @@ rn_xplat_cxx_library( "-DLOG_TAG=\"ReactNative\"", "-DWITH_FBSYSTRACE=1", ], + soname = "libfabriccomponentsjni.$(ext)", tests = [":tests"], visibility = ["PUBLIC"], deps = [ "//third-party/glog:glog", "//xplat/fbsystrace:fbsystrace", - # "//xplat/folly:headers_only", "//xplat/folly:memory", "//xplat/folly:molly", react_native_xplat_target("react/renderer/core:core"), diff --git a/ReactAndroid/src/main/jni/react/fabric/components/CMakeLists.txt b/ReactAndroid/src/main/jni/react/fabric/components/CMakeLists.txt index e69de29bb2d..91a997e4022 100644 --- a/ReactAndroid/src/main/jni/react/fabric/components/CMakeLists.txt +++ b/ReactAndroid/src/main/jni/react/fabric/components/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +cmake_minimum_required(VERSION 3.13) +set(CMAKE_VERBOSE_MAKEFILE on) + +add_compile_options(-fvisibility=hidden -fexceptions -frtti) + +file(GLOB fabriccomponentsjni_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +add_library(fabriccomponentsjni INTERFACE ${fabriccomponentsjni_SRC})