Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add prefab for _uimanager _scheduler and _mounting #35458

Closed
wants to merge 3 commits into from
Closed

Add prefab for _uimanager _scheduler and _mounting #35458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67126e3
Consolidate hermes-executor-debug and -release inside a single target
cortinico Nov 24, 2022
5b68972
Expose `hermes-executor` to be consumed via prefab
cortinico Nov 24, 2022
2d1b75d
Add prefab for _uimanager _scheduler and _mounting
cortinico Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions ReactAndroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,25 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
"rrc_image",
new Pair("../ReactCommon/react/renderer/components/image/", "react/renderer/components/image/")
),
// This prefab target is used by Expo & Reanimated to load a new instance of Hermes
new PrefabPreprocessingEntry(
"hermes-executor",
// "hermes-executor" is statically linking agaisnt "hermes-executor-common"
// and "hermes-inspector". Here we expose only the headers that we know are needed.
new Pair("../ReactCommon/hermes/inspector/", "hermes/inspector/")
),
new PrefabPreprocessingEntry(
"react_render_uimanager",
new Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
),
new PrefabPreprocessingEntry(
"react_render_scheduler",
new Pair("../ReactCommon/react/renderer/scheduler/", "react/renderer/scheduler/"),
),
new PrefabPreprocessingEntry(
"react_render_mounting",
new Pair("../ReactCommon/react/renderer/mounting/", "react/renderer/mounting/"),
),
]
)
it.outputDir.set(prefabHeadersDir)
Expand Down Expand Up @@ -426,32 +445,18 @@ android {
"yoga",
"folly_runtime",
"react_nativemodule_core",
"react_render_imagemanager"
"react_render_imagemanager",
"react_render_uimanager",
"react_render_scheduler",
"react_render_mounting",
"hermes-executor"
}
}
ndk {
abiFilters(*reactNativeArchitectures())
}
}

buildTypes {
debug {
externalNativeBuild {
cmake {
targets "hermes-executor-debug"
}
}
}

release {
externalNativeBuild {
cmake {
targets "hermes-executor-release"
}
}
}
}

externalNativeBuild {
cmake {
path "src/main/jni/CMakeLists.txt"
Expand Down Expand Up @@ -549,6 +554,18 @@ android {
react_render_imagemanager {
headers(new File(prefabHeadersDir, "react_render_imagemanager").absolutePath)
}
react_render_uimanager {
headers(new File(prefabHeadersDir, "react_render_uimanager").absolutePath)
}
react_render_scheduler {
headers(new File(prefabHeadersDir, "react_render_scheduler").absolutePath)
}
react_render_mounting {
headers(new File(prefabHeadersDir, "react_render_mounting").absolutePath)
}
"hermes-executor" {
headers(new File(prefabHeadersDir, "hermes-executor").absolutePath)
}
}

publishing {
Expand Down
1 change: 1 addition & 0 deletions ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ rn_android_library(
react_native_target("java/com/facebook/hermes/instrumentation:instrumentation"),
react_native_target("java/com/facebook/hermes/instrumentation:hermes_samplingprofiler"),
react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"),
react_native_target("jni/react/hermes/reactexecutor:jni"),
":runtimeconfig",
],
Expand Down
9 changes: 5 additions & 4 deletions ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import com.facebook.jni.HybridData;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.soloader.SoLoader;
import javax.annotation.Nullable;

Expand All @@ -23,11 +24,11 @@ public static void loadLibrary() throws UnsatisfiedLinkError {
if (mode_ == null) {
// libhermes must be loaded explicitly to invoke its JNI_OnLoad.
SoLoader.loadLibrary("hermes");
try {
SoLoader.loadLibrary("hermes-executor-debug");
SoLoader.loadLibrary("hermes-executor");
// libhermes-executor is built differently for Debug & Release so we load the proper mode.
if (ReactBuildConfig.DEBUG == true) {
mode_ = "Debug";
} catch (UnsatisfiedLinkError e) {
SoLoader.loadLibrary("hermes-executor-release");
} else {
mode_ = "Release";
}
}
Expand Down
17 changes: 4 additions & 13 deletions ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,20 @@ set(CMAKE_VERBOSE_MAKEFILE on)

file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)

if(${CMAKE_BUILD_TYPE} MATCHES Debug)
set(HERMES_TARGET_SUFFIX debug)
else()
set(HERMES_TARGET_SUFFIX release)
endif()

set(HERMES_TARGET_NAME hermes-executor-${HERMES_TARGET_SUFFIX})

add_library(
${HERMES_TARGET_NAME}
add_library(hermes-executor
SHARED
${hermes_executor_SRC}
)
target_compile_options(
${HERMES_TARGET_NAME}
hermes-executor
PRIVATE
$<$<CONFIG:Debug>:-DHERMES_ENABLE_DEBUGGER=1>
-std=c++17
-fexceptions
)
target_include_directories(${HERMES_TARGET_NAME} PRIVATE .)
target_include_directories(hermes-executor PRIVATE .)
target_link_libraries(
${HERMES_TARGET_NAME}
hermes-executor
hermes-executor-common
jsireact
fb
Expand Down
3 changes: 2 additions & 1 deletion ReactCommon/hermes/executor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ target_link_libraries(hermes-executor-common
jsireact
hermes-engine::libhermes
jsi
debug hermes-inspector
debug
hermes-inspector
)

if(${CMAKE_BUILD_TYPE} MATCHES Debug)
Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
config.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }

configureNewArchPackagingOptions(project, variant)
configureJsEnginePackagingOptions(
config, variant, isHermesEnabledInThisVariant, isDebuggableVariant)
configureJsEnginePackagingOptions(config, variant, isHermesEnabledInThisVariant)

if (!isDebuggableVariant) {
val bundleTask =
Expand Down
19 changes: 4 additions & 15 deletions ...act-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,36 +112,25 @@ internal object NdkConfiguratorUtils {
config: ReactExtension,
variant: Variant,
hermesEnabled: Boolean,
debuggableVariant: Boolean
) {
if (config.enableSoCleanup.get()) {
val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled, debuggableVariant)
val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled)
variant.packaging.jniLibs.excludes.addAll(excludes)
variant.packaging.jniLibs.pickFirsts.addAll(includes)
}
}

fun getPackagingOptionsForVariant(
hermesEnabled: Boolean,
debuggableVariant: Boolean
): Pair<List<String>, List<String>> {
fun getPackagingOptionsForVariant(hermesEnabled: Boolean): Pair<List<String>, List<String>> {
val excludes = mutableListOf<String>()
val includes = mutableListOf<String>()
if (hermesEnabled) {
excludes.add("**/libjsc.so")
excludes.add("**/libjscexecutor.so")
includes.add("**/libhermes.so")
if (debuggableVariant) {
excludes.add("**/libhermes-executor-release.so")
includes.add("**/libhermes-executor-debug.so")
} else {
excludes.add("**/libhermes-executor-debug.so")
includes.add("**/libhermes-executor-release.so")
}
includes.add("**/libhermes-executor.so")
} else {
excludes.add("**/libhermes.so")
excludes.add("**/libhermes-executor-debug.so")
excludes.add("**/libhermes-executor-release.so")
excludes.add("**/libhermes-executor.so")
includes.add("**/libjsc.so")
includes.add("**/libjscexecutor.so")
}
Expand Down
58 changes: 8 additions & 50 deletions ...native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,70 +15,28 @@ import org.junit.Test
class NdkConfiguratorUtilsTest {

@Test
fun getPackagingOptionsForVariant_withHermesEnabled_andDebuggableVariant() {
val (excludes, includes) =
getPackagingOptionsForVariant(hermesEnabled = true, debuggableVariant = true)
fun getPackagingOptionsForVariant_withHermesEnabled() {
val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled = true)

assertTrue("**/libjsc.so" in excludes)
assertTrue("**/libjscexecutor.so" in excludes)
assertTrue("**/libhermes-executor-release.so" in excludes)
assertFalse("**/libjsc.so" in includes)
assertFalse("**/libjscexecutor.so" in includes)
assertFalse("**/libhermes-executor-release.so" in includes)

assertTrue("**/libhermes.so" in includes)
assertTrue("**/libhermes-executor-debug.so" in includes)
assertTrue("**/libhermes-executor.so" in includes)
assertFalse("**/libhermes.so" in excludes)
assertFalse("**/libhermes-executor-debug.so" in excludes)
assertFalse("**/libhermes-executor.so" in excludes)
}

@Test
fun getPackagingOptionsForVariant_withHermesEnabled_andNonDebuggableVariant() {
val (excludes, includes) =
getPackagingOptionsForVariant(hermesEnabled = true, debuggableVariant = false)

assertTrue("**/libjsc.so" in excludes)
assertTrue("**/libjscexecutor.so" in excludes)
assertTrue("**/libhermes-executor-debug.so" in excludes)
assertFalse("**/libjsc.so" in includes)
assertFalse("**/libjscexecutor.so" in includes)
assertFalse("**/libhermes-executor-debug.so" in includes)

assertTrue("**/libhermes.so" in includes)
assertTrue("**/libhermes-executor-release.so" in includes)
assertFalse("**/libhermes.so" in excludes)
assertFalse("**/libhermes-executor-release.so" in excludes)
}

@Test
fun getPackagingOptionsForVariant_withHermesDisabled_andDebuggableVariant() {
val (excludes, includes) =
getPackagingOptionsForVariant(hermesEnabled = false, debuggableVariant = true)

assertTrue("**/libhermes.so" in excludes)
assertTrue("**/libhermes-executor-debug.so" in excludes)
assertTrue("**/libhermes-executor-release.so" in excludes)
assertFalse("**/libhermes.so" in includes)
assertFalse("**/libhermes-executor-debug.so" in includes)
assertFalse("**/libhermes-executor-release.so" in includes)

assertTrue("**/libjsc.so" in includes)
assertTrue("**/libjscexecutor.so" in includes)
assertFalse("**/libjsc.so" in excludes)
assertFalse("**/libjscexecutor.so" in excludes)
}

@Test
fun getPackagingOptionsForVariant_withHermesDisabled_andNonDebuggableVariant() {
val (excludes, includes) =
getPackagingOptionsForVariant(hermesEnabled = false, debuggableVariant = false)
fun getPackagingOptionsForVariant_withHermesDisabled() {
val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled = false)

assertTrue("**/libhermes.so" in excludes)
assertTrue("**/libhermes-executor-debug.so" in excludes)
assertTrue("**/libhermes-executor-release.so" in excludes)
assertTrue("**/libhermes-executor.so" in excludes)
assertFalse("**/libhermes.so" in includes)
assertFalse("**/libhermes-executor-debug.so" in includes)
assertFalse("**/libhermes-executor-release.so" in includes)
assertFalse("**/libhermes-executor.so" in includes)

assertTrue("**/libjsc.so" in includes)
assertTrue("**/libjscexecutor.so" in includes)
Expand Down