From 0a754212cf3e585767a8e26e42ab9ad17fa749f9 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Thu, 2 Dec 2021 02:39:50 -0500 Subject: [PATCH 1/2] Static link for hermes-inspector --- .../src/main/java/com/facebook/hermes/reactexecutor/Android.mk | 2 +- ReactCommon/hermes/inspector/Android.mk | 2 +- .../src/main/kotlin/com/facebook/react/TaskConfiguration.kt | 2 -- react.gradle | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk index 02a267a28c54..2a966a2e48d6 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk @@ -40,7 +40,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no LOCAL_CPP_FEATURES := exceptions -LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug libhermes-inspector +LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug LOCAL_SHARED_LIBRARIES := \ libfb \ libfbjni \ diff --git a/ReactCommon/hermes/inspector/Android.mk b/ReactCommon/hermes/inspector/Android.mk index 4d9dad0fe552..129963a11906 100644 --- a/ReactCommon/hermes/inspector/Android.mk +++ b/ReactCommon/hermes/inspector/Android.mk @@ -31,4 +31,4 @@ LOCAL_SHARED_LIBRARIES := \ libhermes \ libjsi -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt index faeabc7ddcf8..46d8fb183193 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt @@ -230,8 +230,6 @@ private fun Project.cleanupVMFiles( it.include("**/libjsc*.so") if (cleanup) { - // Reduce size by deleting the debugger/inspector - it.include("**/libhermes-inspector.so") it.include("**/libhermes-executor-debug.so") } else { // Release libs take precedence and must be removed diff --git a/react.gradle b/react.gradle index bc5d18d6ccd2..a1cad125e539 100644 --- a/react.gradle +++ b/react.gradle @@ -363,7 +363,6 @@ afterEvaluate { if (cleanup) { // Reduce size by deleting the debugger/inspector - include '**/libhermes-inspector.so' include '**/libhermes-executor-debug.so' } else { // Release libs take precedence and must be removed From 6046501fd9f49d696078bcfe0af1ce2f75f18288 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Thu, 2 Dec 2021 02:44:09 -0500 Subject: [PATCH 2/2] Update TaskConfiguration.kt --- .../src/main/kotlin/com/facebook/react/TaskConfiguration.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt index 46d8fb183193..25313e062f40 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt @@ -230,6 +230,7 @@ private fun Project.cleanupVMFiles( it.include("**/libjsc*.so") if (cleanup) { + // Reduce size by deleting the debugger/inspector it.include("**/libhermes-executor-debug.so") } else { // Release libs take precedence and must be removed