From 20b0eba581a00e5e7e300f6377379b836617c147 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 13 Dec 2021 07:47:23 -0800
Subject: [PATCH] Static link for hermes-inspector (#32694)

Summary:
Follow up to https://github.com/facebook/react-native/issues/32683 to also link hermes-inspector statically.

## Changelog

[Android] [Fix] - Static link for hermes-inspector

Pull Request resolved: https://github.com/facebook/react-native/pull/32694

Test Plan: Tested a clean build and made sure hermes-inspector.so doesn't exist anymore.

Reviewed By: cortinico

Differential Revision: D32791208

Pulled By: ShikaSD

fbshipit-source-id: 6076b263469b9e2c6176d488d13292d4f1731dcc
---
 .../src/main/java/com/facebook/hermes/reactexecutor/Android.mk  | 2 +-
 ReactCommon/hermes/inspector/Android.mk                         | 2 +-
 .../src/main/kotlin/com/facebook/react/TaskConfiguration.kt     | 1 -
 react.gradle                                                    | 1 -
 4 files changed, 2 insertions(+), 4 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 02a267a28c5..2a966a2e48d 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 4d9dad0fe55..129963a1190 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 faeabc7ddcf..25313e062f4 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
@@ -231,7 +231,6 @@ private fun Project.cleanupVMFiles(
 
       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 bc5d18d6ccd..a1cad125e53 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