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

Load jsc or hermes lib in static method #30749

Closed
wants to merge 5 commits into from
Closed

Load jsc or hermes lib in static method #30749

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
540b6de
Load jsc or hermes lib in static method
iqqmuT Jan 16, 2021
afc8270
google-java-format: empty line added
iqqmuT Jan 16, 2021
acab328
Extra comment removed
iqqmuT Jan 18, 2021
a0bca30
SoLoader loads library only once
iqqmuT Sep 3, 2021
a394c7c
empty line added
iqqmuT Sep 14, 2021
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
22 changes: 14 additions & 8 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 @@ -16,14 +16,20 @@ public class HermesExecutor extends JavaScriptExecutor {
private static String mode_;

static {
// libhermes must be loaded explicitly to invoke its JNI_OnLoad.
SoLoader.loadLibrary("hermes");
try {
SoLoader.loadLibrary("hermes-executor-debug");
mode_ = "Debug";
} catch (UnsatisfiedLinkError e) {
SoLoader.loadLibrary("hermes-executor-release");
mode_ = "Release";
loadLibrary();
}

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");
mode_ = "Debug";
} catch (UnsatisfiedLinkError e) {
SoLoader.loadLibrary("hermes-executor-release");
mode_ = "Release";
}
}
}

Expand Down
5 changes: 4 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import android.app.Application;
import android.content.Context;
import androidx.annotation.Nullable;
import com.facebook.hermes.reactexecutor.HermesExecutor;
import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.JSBundleLoader;
Expand All @@ -25,6 +26,7 @@
import com.facebook.react.devsupport.RedBoxHandler;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevSupportManager;
import com.facebook.react.jscexecutor.JSCExecutor;
import com.facebook.react.jscexecutor.JSCExecutorFactory;
import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
import com.facebook.react.packagerconnection.RequestHandler;
Expand Down Expand Up @@ -294,7 +296,7 @@ private JavaScriptExecutorFactory getDefaultJSExecutorFactory(
try {
// If JSC is included, use it as normal
initializeSoLoaderIfNecessary(applicationContext);
SoLoader.loadLibrary("jscexecutor");
JSCExecutor.loadLibrary();
return new JSCExecutorFactory(appName, deviceName);
} catch (UnsatisfiedLinkError jscE) {
// https://github.com/facebook/hermes/issues/78 shows that
Expand All @@ -312,6 +314,7 @@ private JavaScriptExecutorFactory getDefaultJSExecutorFactory(

// Otherwise use Hermes
try {
HermesExecutor.loadLibrary();
return new HermesExecutorFactory();
} catch (UnsatisfiedLinkError hermesE) {
// If we get here, either this is a JSC build, and of course
Expand Down
13 changes: 11 additions & 2 deletions ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,18 @@
import com.facebook.soloader.SoLoader;

@DoNotStrip
/* package */ class JSCExecutor extends JavaScriptExecutor {
/* package */ public class JSCExecutor extends JavaScriptExecutor {
private static boolean loaded = false;
iqqmuT marked this conversation as resolved.
Show resolved Hide resolved

static {
SoLoader.loadLibrary("jscexecutor");
loadLibrary();
}

public static void loadLibrary() throws UnsatisfiedLinkError {
if (!loaded) {
iqqmuT marked this conversation as resolved.
Show resolved Hide resolved
SoLoader.loadLibrary("jscexecutor");
}
loaded = true;
}

/* package */ JSCExecutor(ReadableNativeMap jscConfig) {
Expand Down