diff --git a/BUCK b/BUCK index 3480967c19..2ab1fbb5ac 100644 --- a/BUCK +++ b/BUCK @@ -26,8 +26,8 @@ load( "react_native_xplat_dep", "react_native_xplat_target", "rn_apple_library", + "rn_apple_xplat_cxx_library", "rn_extra_build_flags", - "rn_xplat_cxx_library2", "subdir_glob", ) load("//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace") @@ -70,7 +70,7 @@ rn_codegen_components( schema_target = ":codegen_rn_components_schema_rncore", ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTCxxBridge", srcs = glob([ "React/CxxBridge/*.mm", @@ -130,7 +130,7 @@ RCTCXXMODULE_PUBLIC_HEADERS = { ] } -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTCxxModule", srcs = glob([ "React/CxxModule/*.mm", @@ -171,7 +171,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTCxxUtils", srcs = glob([ "React/CxxUtils/*.mm", @@ -203,7 +203,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTCxxLogUtils", srcs = glob([ "React/CxxLogUtils/*.mm", @@ -362,7 +362,7 @@ REACT_COMPONENTVIEWS_BASE_FILES = [ "React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm", ] -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "ReactInternal", srcs = glob( [ @@ -462,7 +462,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTFabric", srcs = glob( [ @@ -689,7 +689,7 @@ rn_apple_library( # Ideally, each component view gets its own target, and each target uses react_fabric_component_plugin_provider. # For each component, an app can import the base component view, or an app-specific subclass. # i.e. Apps depend on "ImageView" target for RCTImageComponentView.h, and "FBReactImageView" target for FBReactImageComponentView.h -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTFabricComponentViewsBase", srcs = glob(REACT_COMPONENTVIEWS_BASE_FILES), header_namespace = "", @@ -1201,7 +1201,7 @@ rn_apple_library( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTText", srcs = glob([ "Libraries/Text/**/*.m", @@ -1307,7 +1307,7 @@ rn_apple_library( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTWrapper", srcs = glob([ "Libraries/Wrapper/*.m", @@ -1339,7 +1339,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTWrapperExample", srcs = glob([ "Libraries/Wrapper/Example/*.m", @@ -1372,7 +1372,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTSurfaceHostingComponent", srcs = glob([ "Libraries/SurfaceHostingComponent/**/*.m", @@ -1407,7 +1407,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTSurfaceBackedComponent", srcs = glob([ "Libraries/SurfaceBackedComponent/**/*.m", @@ -1443,7 +1443,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTMapView_RNHeader", header_namespace = "", exported_headers = { @@ -1458,7 +1458,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RCTWebPerformance", srcs = glob([ "Libraries/WebPerformance/**/*.cpp", diff --git a/packages/rn-tester/BUCK b/packages/rn-tester/BUCK index dae1544ba4..0a8b6b5259 100644 --- a/packages/rn-tester/BUCK +++ b/packages/rn-tester/BUCK @@ -19,8 +19,9 @@ load( "react_fabric_component_plugin_provider", "react_module_plugin_providers", "rn_apple_library", + "rn_apple_xplat_cxx_library", "rn_extra_build_flags", - "rn_xplat_cxx_library2", + "rn_xplat_cxx_library", ) load("//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace") @@ -208,7 +209,7 @@ fb_xplat_resource( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "RNTesterBundleBinary", srcs = ["//xplat/configurations/buck/apple/common_files:dummy.c"], deps = [":RNTesterBundleAssetCatalog"], @@ -289,7 +290,7 @@ rn_apple_library( ], ) -rn_xplat_cxx_library2( +rn_apple_xplat_cxx_library( name = "NativeComponentExample", plugins_only = True, srcs = glob( @@ -326,7 +327,7 @@ rn_xplat_cxx_library2( ], ) -rn_xplat_cxx_library2( +rn_xplat_cxx_library( name = "NativeCxxModuleExample", srcs = glob(["NativeCxxModuleExample/*.cpp"]), header_namespace = "", diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl index bcc154f4a9..3d475ec77e 100644 --- a/tools/build_defs/oss/rn_defs.bzl +++ b/tools/build_defs/oss/rn_defs.bzl @@ -146,7 +146,7 @@ def rn_xplat_cxx_library( **kwargs ) -rn_xplat_cxx_library2 = rn_xplat_cxx_library +rn_apple_xplat_cxx_library = rn_xplat_cxx_library # Example: react_native_target('java/com/facebook/react/common:common') def react_native_target(path):