Skip to content

Commit 47547d9

Browse files
authored
fix(android): crash when switching to dev server (#1119)
1 parent fd42084 commit 47547d9

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ import android.app.Activity
44
import android.app.Application
55
import android.content.Context
66
import android.util.Log
7+
import com.facebook.hermes.reactexecutor.HermesExecutor
8+
import com.facebook.hermes.reactexecutor.HermesExecutorFactory
79
import com.facebook.react.PackageList
810
import com.facebook.react.ReactInstanceManager
11+
import com.facebook.react.ReactPackage
912
import com.facebook.react.bridge.JSIModulePackage
13+
import com.facebook.react.bridge.JavaScriptExecutorFactory
1014
import com.facebook.react.bridge.ReactContext
1115
import com.facebook.react.bridge.ReactMarker
1216
import com.facebook.react.bridge.ReactMarkerConstants
@@ -150,6 +154,12 @@ class TestAppReactNativeHost(
150154
return reactInstanceManager
151155
}
152156

157+
override fun getJavaScriptExecutorFactory(): JavaScriptExecutorFactory {
158+
SoLoader.init(application, false)
159+
HermesExecutor.loadLibrary()
160+
return HermesExecutorFactory()
161+
}
162+
153163
override fun getJSIModulePackage(): JSIModulePackage? {
154164
return if (BuildConfig.ReactTestApp_useFabric) {
155165
FabricJSIModulePackage(this)
@@ -165,7 +175,7 @@ class TestAppReactNativeHost(
165175

166176
override fun getUseDeveloperSupport() = source == BundleSource.Server
167177

168-
override fun getPackages() = PackageList(application).packages
178+
override fun getPackages(): List<ReactPackage> = PackageList(application).packages
169179

170180
private fun addCustomDevOptions(devSupportManager: DevSupportManager) {
171181
val bundleOption = application.resources.getString(

0 commit comments

Comments
 (0)