Skip to content

Commit 1bc885b

Browse files
neildharfacebook-github-bot
neildhar
authored and
facebook-github-bot
committed
Make JSI a dynamic library
Summary: Ship libjsi as a standalone dynamic library. This prevents problems with exception handling caused by duplicate typeinfo across multiple shared libs, and reduces bundle size by removing duplicate copies of JSI. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D30599215 fbshipit-source-id: abad1398342a5328daa825f3f684e0067cad7a96
1 parent f3e8ea9 commit 1bc885b

File tree

24 files changed

+49
-56
lines changed

24 files changed

+49
-56
lines changed

‎ReactAndroid/Android-prebuilt.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,14 @@ LOCAL_EXPORT_C_INCLUDES := \
156156
$(REACT_COMMON_DIR)/react/renderer/components/view
157157
include $(PREBUILT_SHARED_LIBRARY)
158158

159+
# jsi
160+
include $(CLEAR_VARS)
161+
LOCAL_MODULE := jsi
162+
LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libjsi.so
163+
LOCAL_EXPORT_C_INCLUDES := \
164+
$(REACT_COMMON_DIR)/jsi
165+
include $(PREBUILT_SHARED_LIBRARY)
166+
159167
# react_codegen_rncore
160168
include $(CLEAR_VARS)
161169
LOCAL_MODULE := react_codegen_rncore

‎ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
1818

1919
LOCAL_CPP_FEATURES := exceptions
2020

21-
LOCAL_STATIC_LIBRARIES := libjsireact libjsi
22-
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
21+
LOCAL_STATIC_LIBRARIES := libjsireact
22+
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
2323

2424
include $(BUILD_SHARED_LIBRARY)
2525

‎ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
1717

1818
LOCAL_CPP_FEATURES := exceptions
1919

20-
LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-release
21-
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
20+
LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
21+
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
2222

2323
include $(BUILD_SHARED_LIBRARY)
2424

@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
3434

3535
LOCAL_CPP_FEATURES := exceptions
3636

37-
LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-debug libhermes-inspector
38-
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
37+
LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug libhermes-inspector
38+
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
3939

4040
include $(BUILD_SHARED_LIBRARY)

‎ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni
1111

1212
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1313

14-
LOCAL_SHARED_LIBRARIES := libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
14+
LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
1515

1616
LOCAL_STATIC_LIBRARIES :=
1717

‎ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
1515

1616
LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
1717

18-
LOCAL_STATIC_LIBRARIES := libjsi libjsireact jscruntime
19-
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
18+
LOCAL_STATIC_LIBRARIES := libjsireact jscruntime
19+
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
2020

2121
include $(BUILD_SHARED_LIBRARY)

‎ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
1515

1616
LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
1717

18-
LOCAL_STATIC_LIBRARIES := libjsi libjsireact
19-
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
18+
LOCAL_STATIC_LIBRARIES := libjsireact
19+
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
2020

2121
include $(BUILD_SHARED_LIBRARY)

‎ReactCommon/hermes/executor/Android.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1616
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
1717
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
1818

19-
LOCAL_STATIC_LIBRARIES := libjsi libjsireact
20-
LOCAL_SHARED_LIBRARIES := libhermes
19+
LOCAL_STATIC_LIBRARIES := libjsireact
20+
LOCAL_SHARED_LIBRARIES := libhermes libjsi
2121

2222
include $(BUILD_SHARED_LIBRARY)
2323

@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
3131
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
3232
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
3333

34-
LOCAL_STATIC_LIBRARIES := libjsi libjsireact libhermes-inspector
35-
LOCAL_SHARED_LIBRARIES := libhermes
34+
LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
35+
LOCAL_SHARED_LIBRARIES := libhermes libjsi
3636

3737
include $(BUILD_SHARED_LIBRARY)

‎ReactCommon/hermes/inspector/Android.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT)
2121

2222
LOCAL_CPP_FEATURES := exceptions
2323

24-
LOCAL_STATIC_LIBRARIES := libjsi
25-
LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes
24+
LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes libjsi libglog
2625

2726
include $(BUILD_SHARED_LIBRARY)

‎ReactCommon/jsi/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
1717
LOCAL_CFLAGS := -fexceptions -frtti -O3
1818
LOCAL_SHARED_LIBRARIES := libfolly_json glog
1919

20-
include $(BUILD_STATIC_LIBRARY)
20+
include $(BUILD_SHARED_LIBRARY)
2121

2222

2323
include $(CLEAR_VARS)

‎ReactCommon/jsiexecutor/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
1616

1717
LOCAL_CFLAGS := -fexceptions -frtti -O3
1818

19-
LOCAL_STATIC_LIBRARIES := libjsi reactnative reactperflogger
20-
LOCAL_SHARED_LIBRARIES := libfolly_json glog
19+
LOCAL_STATIC_LIBRARIES := reactnative reactperflogger
20+
LOCAL_SHARED_LIBRARIES := libfolly_json glog libjsi
2121

2222
include $(BUILD_STATIC_LIBRARY)

‎ReactCommon/react/nativemodule/core/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCA
1515

1616
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
1717

18-
LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni libreact_debug
18+
LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni libreact_debug libjsi
1919

20-
LOCAL_STATIC_LIBRARIES := libjsi libreactperflogger
20+
LOCAL_STATIC_LIBRARIES := libreactperflogger
2121

2222
LOCAL_CFLAGS := \
2323
-DLOG_TAG=\"ReactNative\"

‎ReactCommon/react/nativemodule/samples/platform/android/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LOCAL_MODULE := sampleturbomodule
1010
LOCAL_C_INCLUDES := $(LOCAL_PATH)
1111
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
1212
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
13-
LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core
13+
LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libjsi
1414
LOCAL_CFLAGS := \
1515
-DLOG_TAG=\"ReactNative\"
1616
LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall

‎ReactCommon/react/renderer/components/image/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
24+
LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/components/scrollview/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
24+
LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/components/text/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
24+
LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/components/textinput/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
24+
LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/components/unimplementedview/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
24+
LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/components/view/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug logger
24+
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug logger libjsi
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/core/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1515

1616
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
1717

18-
LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics
18+
LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics libglog
1919

2020
LOCAL_CFLAGS := \
2121
-DLOG_TAG=\"Fabric\"

‎ReactCommon/react/renderer/mounting/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
2121

2222
LOCAL_STATIC_LIBRARIES :=
2323

24-
LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
24+
LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
2525

2626
include $(BUILD_SHARED_LIBRARY)
2727

‎ReactCommon/react/renderer/runtimescheduler/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
1515

1616
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
1717

18-
LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug
18+
LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi
1919

2020
LOCAL_CFLAGS := \
2121
-DLOG_TAG=\"Fabric\"

‎packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
8080
8181
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}
8282
83-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
84-
85-
LOCAL_STATIC_LIBRARIES := libjsi
83+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
8684
8785
LOCAL_CFLAGS := \\
8886
-DLOG_TAG=\\"ReactNative\\"

‎packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
5252
5353
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
5454
55-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
56-
57-
LOCAL_STATIC_LIBRARIES := libjsi
55+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
5856
5957
LOCAL_CFLAGS := \\\\
6058
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -118,9 +116,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
118116
119117
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
120118
121-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
122-
123-
LOCAL_STATIC_LIBRARIES := libjsi
119+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
124120
125121
LOCAL_CFLAGS := \\\\
126122
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -184,9 +180,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
184180
185181
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
186182
187-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
188-
189-
LOCAL_STATIC_LIBRARIES := libjsi
183+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
190184
191185
LOCAL_CFLAGS := \\\\
192186
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -258,9 +252,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
258252
259253
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
260254
261-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
262-
263-
LOCAL_STATIC_LIBRARIES := libjsi
255+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
264256
265257
LOCAL_CFLAGS := \\\\
266258
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -324,9 +316,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
324316
325317
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
326318
327-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
328-
329-
LOCAL_STATIC_LIBRARIES := libjsi
319+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
330320
331321
LOCAL_CFLAGS := \\\\
332322
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -398,9 +388,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
398388
399389
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
400390
401-
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
402-
403-
LOCAL_STATIC_LIBRARIES := libjsi
391+
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
404392
405393
LOCAL_CFLAGS := \\\\
406394
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"

‎yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,9 +3298,9 @@ has@^1.0.3:
32983298
function-bind "^1.1.1"
32993299

33003300
hermes-engine@~0.8.0:
3301-
version "0.8.0"
3302-
resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.8.0.tgz#d8e507fbfda66f6bd604f79503b45fded1163296"
3303-
integrity sha512-bFxAnIjE8M3cco1uh4HlHME8qmOsPcVS75bQoo/fM3wUzMYxZBL0s1IfePUO+R9IUKoO+pfIpjV2I9ay8w7mqw==
3301+
version "0.8.1"
3302+
resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.8.1.tgz#b6d0d70508ac5add2d198304502fb968cdecb8b2"
3303+
integrity sha512-as9Iccj/qrqqtDmfYUHbOIjt5xsQbUB6pjNIW3i1+RVr+pCAdz5S8/Jry778mz3rJWplYzHWdR1u1xQSYfBRYw==
33043304

33053305
[email protected]:
33063306
version "0.4.7"

0 commit comments

Comments
 (0)