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
This commit is contained in:
Родитель
a68415270c
Коммит
fb34fba01c
|
@ -131,6 +131,6 @@ rn_apple_library(
|
||||||
"//xplat/js:RCTLinkingApple",
|
"//xplat/js:RCTLinkingApple",
|
||||||
"//xplat/js:RCTPushNotificationApple",
|
"//xplat/js:RCTPushNotificationApple",
|
||||||
"//xplat/js/react-native-github:ReactInternalApple",
|
"//xplat/js/react-native-github:ReactInternalApple",
|
||||||
"//xplat/js/react-native-github/Libraries:generated_objcpp_modules-FBReactNativeSpecApple",
|
"//xplat/js/react-native-github/Libraries:FBReactNativeSpecApple",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -29,5 +29,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
||||||
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -40,7 +40,7 @@ rn_android_library(
|
||||||
react_native_target("res:devsupport"),
|
react_native_target("res:devsupport"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -19,5 +19,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/core:core"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,5 +17,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/core:core"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,5 +17,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/core:core"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -32,6 +32,6 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/modules/websocket:websocket"),
|
react_native_target("java/com/facebook/react/modules/websocket:websocket"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,5 +18,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/devsupport:interfaces"),
|
react_native_target("java/com/facebook/react/devsupport:interfaces"),
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,6 +19,6 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,6 +22,6 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/util:util"),
|
react_native_target("java/com/facebook/react/util:util"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -23,5 +23,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/common:common"),
|
react_native_target("java/com/facebook/react/common:common"),
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -24,7 +24,7 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,6 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -24,5 +24,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/common:common"),
|
react_native_target("java/com/facebook/react/common:common"),
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,6 +25,6 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/views/image:image"),
|
react_native_target("java/com/facebook/react/views/image:image"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,5 +17,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/common:common"),
|
react_native_target("java/com/facebook/react/common:common"),
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -29,5 +29,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/core:core"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -16,5 +16,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/core:core"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -16,5 +16,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/common:common"),
|
react_native_target("java/com/facebook/react/common:common"),
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,5 +20,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,5 +25,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/uimanager:uimanager"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,5 +19,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/common:common"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,7 +22,7 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
|
react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
":systeminfo-moduleless",
|
":systeminfo-moduleless",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -45,5 +45,5 @@ rn_android_library(
|
||||||
react_native_dep("third-party/java/jsr-305:jsr-305"),
|
react_native_dep("third-party/java/jsr-305:jsr-305"),
|
||||||
react_native_target("res:systeminfo"),
|
react_native_target("res:systeminfo"),
|
||||||
],
|
],
|
||||||
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
|
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -15,5 +15,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/common:common"),
|
react_native_target("java/com/facebook/react/common:common"),
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,5 +17,5 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
react_native_target("java/com/facebook/react/module/annotations:annotations"),
|
||||||
react_native_target("java/com/facebook/react/modules/core:core"),
|
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")],
|
||||||
)
|
)
|
||||||
|
|
|
@ -23,6 +23,6 @@ rn_android_library(
|
||||||
react_native_target("java/com/facebook/react/modules/network:network"),
|
react_native_target("java/com/facebook/react/modules/network:network"),
|
||||||
],
|
],
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
|
react_native_root_target("Libraries:FBReactNativeSpec"),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -94,8 +94,8 @@ rn_xplat_cxx_library(
|
||||||
"PUBLIC",
|
"PUBLIC",
|
||||||
],
|
],
|
||||||
deps = [
|
deps = [
|
||||||
|
":FBReactNativeTestSpec",
|
||||||
":generated_components-codegen_tests",
|
":generated_components-codegen_tests",
|
||||||
":generated_objcpp_modules-codegen_tests",
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -103,8 +103,8 @@ def rn_codegen_cli():
|
||||||
)
|
)
|
||||||
|
|
||||||
def rn_codegen_modules(
|
def rn_codegen_modules(
|
||||||
|
name,
|
||||||
native_module_spec_name,
|
native_module_spec_name,
|
||||||
name = "",
|
|
||||||
library_labels = [],
|
library_labels = [],
|
||||||
schema_target = ""):
|
schema_target = ""):
|
||||||
generate_fixtures_rule_name = "generate_fixtures_modules-{}".format(name)
|
generate_fixtures_rule_name = "generate_fixtures_modules-{}".format(name)
|
||||||
|
@ -157,7 +157,7 @@ def rn_codegen_modules(
|
||||||
)
|
)
|
||||||
|
|
||||||
rn_android_library(
|
rn_android_library(
|
||||||
name = "generated_java_modules-{}".format(name),
|
name = "{}".format(native_module_spec_name),
|
||||||
srcs = [
|
srcs = [
|
||||||
":{}".format(generate_module_java_zip_name),
|
":{}".format(generate_module_java_zip_name),
|
||||||
],
|
],
|
||||||
|
@ -176,7 +176,7 @@ def rn_codegen_modules(
|
||||||
)
|
)
|
||||||
|
|
||||||
rn_xplat_cxx_library(
|
rn_xplat_cxx_library(
|
||||||
name = "generated_java_modules-{}-jni".format(name),
|
name = "{}-jni".format(native_module_spec_name),
|
||||||
srcs = [
|
srcs = [
|
||||||
":{}".format(generate_module_jni_cpp_name),
|
":{}".format(generate_module_jni_cpp_name),
|
||||||
],
|
],
|
||||||
|
@ -229,7 +229,7 @@ def rn_codegen_modules(
|
||||||
)
|
)
|
||||||
|
|
||||||
rn_apple_library(
|
rn_apple_library(
|
||||||
name = "generated_objcpp_modules-{}Apple".format(name),
|
name = "{}Apple".format(native_module_spec_name),
|
||||||
extension_api_only = True,
|
extension_api_only = True,
|
||||||
header_namespace = "",
|
header_namespace = "",
|
||||||
sdks = (IOS),
|
sdks = (IOS),
|
||||||
|
|
Загрузка…
Ссылка в новой задаче