From 5d79b26011bb9b5f8020b0b62f3b79d93a57bee3 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 7 Aug 2017 09:45:45 -0700 Subject: [PATCH] Limit calls to SoLoader Reviewed By: kathryngray Differential Revision: D5536048 fbshipit-source-id: 525d5a37f41671abd4b56e5a6f4b88e9af9927b8 --- .../main/java/com/facebook/react/bridge/ReactBridge.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java index f0b7449e2..89ebbd740 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java @@ -12,8 +12,13 @@ package com.facebook.react.bridge; import com.facebook.soloader.SoLoader; public class ReactBridge { + private static boolean sDidInit = false; public static void staticInit() { - // Ideally we'd put this in static and only run it once, but that causes this method to get stripped - SoLoader.loadLibrary("reactnativejni"); + // No locking required here, worst case we'll call into SoLoader twice + // which will do its own locking internally + if (!sDidInit) { + SoLoader.loadLibrary("reactnativejni"); + sDidInit = true; + } } }