Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe removing it here is incorrect, as hermes-inspector is only used by debug flavour of executor

Copy link
Contributor Author

@janicduplessis janicduplessis Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my understanding libhermes-inspector is linked into libhermes-executor-common-debug already (

LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
) so it doesn't need to be included here. I checked the code quickly and it also doesn't seem to be using classes from libhermes-inspector directly (no <hermes/inspector/*> in ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor).

Copy link
Contributor

@ShikaSD ShikaSD Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, makes sense :)

LOCAL_SHARED_LIBRARIES := \
libfb \
libfbjni \
Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/hermes/inspector/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ LOCAL_SHARED_LIBRARIES := \
libhermes \
libjsi

include $(BUILD_SHARED_LIBRARY)
include $(BUILD_STATIC_LIBRARY)
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion react.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down