From bfb7912e9d813485408db697327fe3b030f76cc7 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Fri, 12 Jul 2019 14:58:57 -0400 Subject: [PATCH 1/2] Remove jsc dep from blob native library --- .../main/java/com/facebook/react/modules/blob/jni/Android.mk | 2 +- .../src/main/java/com/facebook/react/modules/blob/jni/BUCK | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk index b0ef370c574413..9eb190ae8ab10c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk @@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti -LOCAL_STATIC_LIBRARIES := libjsi libjsireact jscruntime +LOCAL_STATIC_LIBRARIES := libjsi libjsireact LOCAL_SHARED_LIBRARIES := libfolly_json libfb libreactnativejni include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK index c02646779b63f8..3c70d2da88d165 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK @@ -16,7 +16,6 @@ rn_xplat_cxx_library( "fbsource//xplat/folly:molly", FBJNI_TARGET, react_native_target("jni/react/jni:jni"), - react_native_xplat_target("jsi:JSCRuntime"), react_native_xplat_target("jsiexecutor:jsiexecutor"), ], ) From b03a9ebf53e9041f852a5b2d60294b09c771b26e Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Fri, 19 Jul 2019 13:13:17 -0400 Subject: [PATCH 2/2] Use jsi instead of jsiexecutor --- .../src/main/java/com/facebook/react/modules/blob/jni/BUCK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK index 3c70d2da88d165..f396c6d6782b83 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK @@ -16,6 +16,6 @@ rn_xplat_cxx_library( "fbsource//xplat/folly:molly", FBJNI_TARGET, react_native_target("jni/react/jni:jni"), - react_native_xplat_target("jsiexecutor:jsiexecutor"), + react_native_xplat_target("jsi:jsi"), ], )