move xplat build rules: folly/functional/

Reviewed By: dmm-fb

Differential Revision: D77344445

fbshipit-source-id: 7b4185f2b45e75af03c5ffc4d4d69ac02c60a04b

Author: yfeldblum

folly/BUCK

@@ -1784,48 +1784,27 @@ non_fbcode_target(
 )
 
 non_fbcode_target(
+    # @shim
     _kind = folly_xplat_library,
     name = "functional_invoke",
     feature = triage_InfrastructureSupermoduleOptou,
-    raw_headers = [
-        "functional/Invoke.h",
-    ],
-    exported_deps = [
-        ":cpp_attributes",
-        ":portability",
-        ":preprocessor",
-        ":traits",
-        ":utility",
-        "//third-party/boost:boost_preprocessor",
-        "//xplat/folly/lang:customization_point",
-    ],
+    exported_deps = ["//xplat/folly/functional:invoke"],
 )
 
 non_fbcode_target(
+    # @shim
     _kind = folly_xplat_library,
     name = "functional_protocol",
     feature = triage_InfrastructureSupermoduleOptou,
-    raw_headers = [
-        "functional/protocol.h",
-    ],
-    exported_deps = [
-        ":functional_invoke",
-        ":functional_traits",
-        ":portability",
-        ":traits",
-    ],
+    exported_deps = ["//xplat/folly/functional:protocol"],
 )
 
 non_fbcode_target(
+    # @shim
     _kind = folly_xplat_library,
     name = "functional_traits",
     feature = triage_InfrastructureSupermoduleOptou,
-    raw_headers = [
-        "functional/traits.h",
-    ],
-    exported_deps = [
-        ":traits",
-    ],
+    exported_deps = ["//xplat/folly/functional:traits"],
 )
 
 non_fbcode_target(
@@ -1848,30 +1827,19 @@ non_fbcode_target(
 )
 
 non_fbcode_target(
+    # @shim
     _kind = folly_xplat_library,
     name = "functional_apply_tuple",
     feature = triage_InfrastructureSupermoduleOptou,
-    raw_headers = [
-        "functional/ApplyTuple.h",
-    ],
-    exported_deps = [
-        ":functional_invoke",
-        ":traits",
-        ":utility",
-    ],
+    exported_deps = ["//xplat/folly/functional:apply_tuple"],
 )
 
 non_fbcode_target(
+    # @shim
     _kind = folly_xplat_library,
     name = "functional_partial",
     feature = triage_InfrastructureSupermoduleOptou,
-    raw_headers = [
-        "functional/Partial.h",
-    ],
-    exported_deps = [
-        ":functional_invoke",
-        ":utility",
-    ],
+    exported_deps = ["//xplat/folly/functional:partial"],
 )
 
 non_fbcode_target(

folly/functional/BUCK

@@ -1,8 +1,76 @@
-load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target")
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
+load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library")
+load("@fbsource//xplat/pfh/triage_InfrastructureSupermoduleOptou:DEFS.bzl", "triage_InfrastructureSupermoduleOptou")
 
 oncall("fbcode_entropy_wardens_folly")
 
+# xplat build rules
+
+non_fbcode_target(
+    _kind = folly_xplat_library,
+    name = "apply_tuple",
+    feature = triage_InfrastructureSupermoduleOptou,
+    raw_headers = ["ApplyTuple.h"],
+    exported_deps = [
+        ":invoke",
+        "//xplat/folly:traits",
+        "//xplat/folly:utility",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_library,
+    name = "invoke",
+    feature = triage_InfrastructureSupermoduleOptou,
+    raw_headers = ["Invoke.h"],
+    exported_deps = [
+        "//third-party/boost:boost_preprocessor",
+        "//xplat/folly:cpp_attributes",
+        "//xplat/folly:portability",
+        "//xplat/folly:preprocessor",
+        "//xplat/folly:traits",
+        "//xplat/folly:utility",
+        "//xplat/folly/lang:customization_point",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_library,
+    name = "partial",
+    feature = triage_InfrastructureSupermoduleOptou,
+    raw_headers = ["Partial.h"],
+    exported_deps = [
+        ":invoke",
+        "//xplat/folly:utility",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_library,
+    name = "protocol",
+    feature = triage_InfrastructureSupermoduleOptou,
+    raw_headers = ["protocol.h"],
+    exported_deps = [
+        ":invoke",
+        ":traits",
+        "//xplat/folly:portability",
+        "//xplat/folly:traits",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_library,
+    name = "traits",
+    feature = triage_InfrastructureSupermoduleOptou,
+    raw_headers = ["traits.h"],
+    exported_deps = [
+        "//xplat/folly:traits",
+    ],
+)
+
+# fbcode build rules
+
 fbcode_target(
     _kind = cpp_library,
     name = "apply_tuple",

folly/functional/test/BUCK

@@ -1,8 +1,73 @@
-load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target")
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
+load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_test")
+load("@fbsource//xplat/pfh/triage_InfrastructureSupermoduleOptou:DEFS.bzl", "triage_InfrastructureSupermoduleOptou")
 
 oncall("fbcode_entropy_wardens_folly")
 
+# xplat unit tests
+
+non_fbcode_target(
+    _kind = folly_xplat_cxx_test,
+    name = "apply_tuple_test",
+    srcs = ["ApplyTupleTest.cpp"],
+    feature = triage_InfrastructureSupermoduleOptou,
+    deps = [
+        "//xplat/folly:overload",
+        "//xplat/folly:portability_gtest",
+        "//xplat/folly/functional:apply_tuple",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_cxx_test,
+    name = "invoke_test",
+    srcs = ["InvokeTest.cpp"],
+    feature = triage_InfrastructureSupermoduleOptou,
+    deps = [
+        "//xplat/folly:cpp_attributes",
+        "//xplat/folly:portability_gtest",
+        "//xplat/folly/functional:invoke",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_cxx_test,
+    name = "partial_test",
+    srcs = ["PartialTest.cpp"],
+    feature = triage_InfrastructureSupermoduleOptou,
+    deps = [
+        "//xplat/folly:function",
+        "//xplat/folly:portability_gtest",
+        "//xplat/folly/functional:partial",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_cxx_test,
+    name = "protocol_test",
+    srcs = ["protocol_test.cpp"],
+    feature = triage_InfrastructureSupermoduleOptou,
+    deps = [
+        "//xplat/folly:portability_gtest",
+        "//xplat/folly:traits",
+        "//xplat/folly/functional:protocol",
+    ],
+)
+
+non_fbcode_target(
+    _kind = folly_xplat_cxx_test,
+    name = "traits_test",
+    srcs = ["traits_test.cpp"],
+    feature = triage_InfrastructureSupermoduleOptou,
+    deps = [
+        "//xplat/folly:portability_gtest",
+        "//xplat/folly/functional:traits",
+    ],
+)
+
+# fbcode unit tests
+
 fbcode_target(
     _kind = cpp_unittest,
     name = "apply_tuple_test",

folly/somerge_defs.bzl

@@ -2,7 +2,7 @@
 
 Generated by xplat/cross_plat_devx/somerge_maps/compute_merge_maps.py
 
-@generated SignedSource<<5ece455ac8430b3b464e49e6570b9f18>>
+@generated SignedSource<<0089029841c077f6c298964d37265b74>>
 """
 
 # Entry Points:
@@ -27,6 +27,9 @@ FOLLY_NATIVE_LIBRARY_MERGE_MAP = [
     "fbsource//xplat/folly/detail:sseAndroid",
     "fbsource//xplat/folly/experimental/coro:coroutineAndroid",
     "fbsource//xplat/folly/external/nvidia/detail:range_sve2Android",
+    "fbsource//xplat/folly/functional:apply_tupleAndroid",
+    "fbsource//xplat/folly/functional:invokeAndroid",
+    "fbsource//xplat/folly/functional:partialAndroid",
     "fbsource//xplat/folly/lang:alignAndroid",
     "fbsource//xplat/folly/lang:assumeAndroid",
     "fbsource//xplat/folly/lang:bitsAndroid",
@@ -186,6 +189,7 @@ FOLLY_BASE_NATIVE_LIBRARY_MERGE_MAP = [
     "fbsource//xplat/folly/fibers:guard_page_allocatorAndroid",
     "fbsource//xplat/folly/fibers:loop_controllerAndroid",
     "fbsource//xplat/folly/fibers:traitsAndroid",
+    "fbsource//xplat/folly/functional:traitsAndroid",
     "fbsource//xplat/folly/io/async/ssl:tls_definitionsAndroid",
     "fbsource//xplat/folly/io/async:async_baseAndroid",
     "fbsource//xplat/folly/io/async:async_base_fwdAndroid",