Use native_module_spec_name to name codegen targets

Summary: ## Description Suppose this was the codegen declaration before: ``` rn_library( name = "FooModule", native_module_spec_name = "FBReactNativeSpec", codegen_modules = True, # ... ) ``` Previously, this would generate the following BUCK targets: - generated_objcpp_modules-FooModuleApple - generated_java_modules-FooModuleAndroid - generated_java_modules-FooModule-jniAndroid ## Changes We will now generate: - FBReactNativeSpecApple - FBReactNativeSpecAndroid - FBReactNativeSpec-jniAndroid This matches the naming scheme of the old codegen. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D25680224 fbshipit-source-id: 617ac18fd915f3277f6bd98072d147f20fb193e5
2020-12-24 00:47:38 -08:00 · 2020-12-24 00:47:38 -08:00 · fb34fba01c
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@ -131,6 +131,6 @@ rn_apple_library(
        "//xplat/js:RCTLinkingApple",
        "//xplat/js:RCTPushNotificationApple",
        "//xplat/js/react-native-github:ReactInternalApple",
-        "//xplat/js/react-native-github/Libraries:generated_objcpp_modules-FBReactNativeSpecApple",
+        "//xplat/js/react-native-github/Libraries:FBReactNativeSpecApple",
    ],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@ -29,5 +29,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/uimanager:uimanager"),
        react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@ -40,7 +40,7 @@ rn_android_library(
        react_native_target("res:devsupport"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )

--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
@ -19,5 +19,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/core:core"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
@ -17,5 +17,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/core:core"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
@ -17,5 +17,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/core:core"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
@ -32,6 +32,6 @@ rn_android_library(
        react_native_target("java/com/facebook/react/modules/websocket:websocket"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
@ -18,5 +18,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/devsupport:interfaces"),
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
@ -19,6 +19,6 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@ -22,6 +22,6 @@ rn_android_library(
        react_native_target("java/com/facebook/react/util:util"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
@ -23,5 +23,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/common:common"),
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
@ -24,7 +24,7 @@ rn_android_library(
        react_native_target("java/com/facebook/react/uimanager:uimanager"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )

--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
@ -20,6 +20,6 @@ rn_android_library(
        react_native_target("java/com/facebook/react/uimanager:uimanager"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
@ -24,5 +24,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/common:common"),
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
@ -25,6 +25,6 @@ rn_android_library(
        react_native_target("java/com/facebook/react/views/image:image"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
@ -17,5 +17,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/common:common"),
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
@ -29,5 +29,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/core:core"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
@ -16,5 +16,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/core:core"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
@ -16,5 +16,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/common:common"),
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
@ -20,5 +20,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/uimanager:uimanager"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
@ -25,5 +25,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/uimanager:uimanager"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
@ -19,5 +19,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/common:common"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
@ -22,7 +22,7 @@ rn_android_library(
        react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
        ":systeminfo-moduleless",
    ],
 )
@ -45,5 +45,5 @@ rn_android_library(
        react_native_dep("third-party/java/jsr-305:jsr-305"),
        react_native_target("res:systeminfo"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
@ -15,5 +15,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/common:common"),
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
@ -17,5 +17,5 @@ rn_android_library(
        react_native_target("java/com/facebook/react/module/annotations:annotations"),
        react_native_target("java/com/facebook/react/modules/core:core"),
    ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
@ -23,6 +23,6 @@ rn_android_library(
        react_native_target("java/com/facebook/react/modules/network:network"),
    ],
    exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
    ],
 )
--- a/packages/react-native-codegen/BUCK
+++ b/packages/react-native-codegen/BUCK
@ -94,8 +94,8 @@ rn_xplat_cxx_library(
        "PUBLIC",
    ],
    deps = [
+        ":FBReactNativeTestSpec",
        ":generated_components-codegen_tests",
-        ":generated_objcpp_modules-codegen_tests",
    ],
 )

--- a/packages/react-native-codegen/DEFS.bzl
+++ b/packages/react-native-codegen/DEFS.bzl
@ -103,8 +103,8 @@ def rn_codegen_cli():
        )

 def rn_codegen_modules(
+        name,
        native_module_spec_name,
-        name = "",
        library_labels = [],
        schema_target = ""):
    generate_fixtures_rule_name = "generate_fixtures_modules-{}".format(name)
@ -157,7 +157,7 @@ def rn_codegen_modules(
    )

    rn_android_library(
-        name = "generated_java_modules-{}".format(name),
+        name = "{}".format(native_module_spec_name),
        srcs = [
            ":{}".format(generate_module_java_zip_name),
        ],
@ -176,7 +176,7 @@ def rn_codegen_modules(
    )

    rn_xplat_cxx_library(
-        name = "generated_java_modules-{}-jni".format(name),
+        name = "{}-jni".format(native_module_spec_name),
        srcs = [
            ":{}".format(generate_module_jni_cpp_name),
        ],
@ -229,7 +229,7 @@ def rn_codegen_modules(
        )

        rn_apple_library(
-            name = "generated_objcpp_modules-{}Apple".format(name),
+            name = "{}Apple".format(native_module_spec_name),
            extension_api_only = True,
            header_namespace = "",
            sdks = (IOS),