static cpp

Author: sunnylqm

android/build.gradle

@@ -162,11 +162,6 @@ android {
             resValue("string", "pushy_build_time", "0")
         }
     }
-
-    packagingOptions {
-        exclude "**/libc++_shared.so"
-    }
-    
     lintOptions {
         abortOnError false
     }

android/jni/Application.mk

@@ -7,4 +7,4 @@ APP_CPPFLAGS += -std=c++17 -Oz -fno-exceptions -fno-rtti -fno-unwind-tables -fno
 APP_LDFLAGS += -Wl,--gc-sections -Wl,--exclude-libs,ALL
 APP_BUILD_SCRIPT := Android.mk
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
-APP_STL := c++_shared
+APP_STL := c++_static

android/lib/arm64-v8a/librnupdate.so

@@ -11,19 +11,11 @@ static synchronized void ensureLoaded() {
             return;
         }
 
-        try {
-            System.loadLibrary("c++_shared");
-        } catch (UnsatisfiedLinkError ignored) {
-            // Fall back to the transitive dependency load path when the host app already
-            // packages libc++_shared.so but the linker has not loaded it yet.
-        }
-
         try {
             System.loadLibrary("rnupdate");
         } catch (UnsatisfiedLinkError error) {
             UnsatisfiedLinkError wrapped = new UnsatisfiedLinkError(
-                "Failed to load rnupdate. Ensure the host app packages libc++_shared.so "
-                    + "when using the shared C++ runtime. Original error: "
+                "Failed to load rnupdate native library. Original error: "
                     + error.getMessage());
             wrapped.initCause(error);
             throw wrapped;

android/lib/armeabi-v7a/librnupdate.so

@@ -13,7 +13,7 @@
     "test": "bun test src/__tests__",
     "test:patch-core": "./scripts/test-patch-core.sh",
     "build:harmony-har": "node scripts/build-harmony-har.js",
-    "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib && ./scripts/prune-host-stl.sh android/lib",
+    "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
     "build:ios-debug": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.debug",
     "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/testHotUpdate && E2E_PLATFORM=ios detox test --configuration ios.sim.debug",