From bbee3b60efbb8ccae4d3354456204d8c3f6ed6b0 Mon Sep 17 00:00:00 2001
From: Alpha <alpha0010@users.noreply.github.com>
Date: Wed, 22 Apr 2026 09:49:02 -0400
Subject: [PATCH] fix(android): compile native code into merged SO

---
 package/android/src/main/jni/CMakeLists.txt | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/package/android/src/main/jni/CMakeLists.txt b/package/android/src/main/jni/CMakeLists.txt
index 6fe63910..d55272ea 100644
--- a/package/android/src/main/jni/CMakeLists.txt
+++ b/package/android/src/main/jni/CMakeLists.txt
@@ -12,12 +12,21 @@ set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/
 file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
 file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
 
-add_library(
-  ${LIB_TARGET_NAME}
-  SHARED
-  ${LIB_CUSTOM_SRCS}
-  ${LIB_CODEGEN_SRCS}
-)
+if (REACTNATIVE_MERGED_SO)
+  add_library(
+    ${LIB_TARGET_NAME}
+    OBJECT
+    ${LIB_CUSTOM_SRCS}
+    ${LIB_CODEGEN_SRCS}
+  )
+else()
+  add_library(
+    ${LIB_TARGET_NAME}
+    SHARED
+    ${LIB_CUSTOM_SRCS}
+    ${LIB_CODEGEN_SRCS}
+  )
+endif()
 
 target_include_directories(
   ${LIB_TARGET_NAME}