Move react_debug to be consumed via prefab

Summary:
This removes the old way of consuming `react_debug.so` from
`Android-prebuilt.cmake` to using Prefab which is natively supported
by the Android pipeline.

Changelog:
[Internal] [Changed] - Move `react_debug` to be consumed via prefab

Reviewed By: cipolleschi

Differential Revision: D39889945

fbshipit-source-id: e31f3c3027718a54c0a7228db00d145c1f3f7873
This commit is contained in:
Nicola Corti
2022-09-28 12:18:18 -07:00
committed by Facebook GitHub Bot
parent 628db1fcd3
commit 86fcab613f
3 changed files with 11 additions and 11 deletions
+9 -1
View File
@@ -78,6 +78,10 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
"react_codegen_rncore",
new Pair(new File(buildDir, "generated/source/codegen/jni/").absolutePath, "")
),
new PrefabPreprocessingEntry(
"react_debug",
new Pair("../ReactCommon/react/debug/", "react/debug/")
),
]
)
it.outputDir.set(prefabHeadersDir)
@@ -336,7 +340,8 @@ android {
"react_render_debug",
"turbomodulejsijni",
"runtimeexecutor",
"react_codegen_rncore"
"react_codegen_rncore",
"react_debug"
}
}
ndk {
@@ -419,6 +424,9 @@ android {
react_codegen_rncore {
headers(new File(prefabHeadersDir, "react_codegen_rncore").absolutePath)
}
react_debug {
headers(new File(prefabHeadersDir, "react_debug").absolutePath)
}
}
publishing {
@@ -114,15 +114,6 @@ target_include_directories(react_render_core
${REACT_COMMON_DIR}
${REACT_COMMON_DIR}/react/renderer/core)
## react_debug
add_library(react_debug SHARED IMPORTED GLOBAL)
set_target_properties(react_debug
PROPERTIES
IMPORTED_LOCATION
${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_debug.so)
target_include_directories(react_debug INTERFACE ${REACT_COMMON_DIR}/react/debug)
target_link_libraries(react_nativemodule_core INTERFACE folly_runtime)
## react_render_graphics
add_library(react_render_graphics SHARED IMPORTED GLOBAL)
set_target_properties(react_render_graphics
@@ -45,6 +45,7 @@ add_library(react_render_debug ALIAS ReactAndroid::react_render_debug)
add_library(turbomodulejsijni ALIAS ReactAndroid::turbomodulejsijni)
add_library(runtimeexecutor ALIAS ReactAndroid::runtimeexecutor)
add_library(react_codegen_rncore ALIAS ReactAndroid::react_codegen_rncore)
add_library(react_debug ALIAS ReactAndroid::react_debug)
target_link_libraries(${CMAKE_PROJECT_NAME}
fabricjni
@@ -53,7 +54,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
glog
jsi
react_codegen_rncore # prefab ready
react_debug
react_debug # prefab ready
react_nativemodule_core
react_newarchdefaults
react_render_componentregistry