react-native-update 10.59.2 → 10.61.0

package/README-CN.md

@@ -2,7 +2,7 @@
 
 [English README](./README.md)
 
-本组件是面向 React Native 提供热更新功能的组件，详情请访问我们的官方网站 <https://pushy.reactnative.cn>。
+`react-native-update`（Pushy）是面向 React Native 的热更新（OTA）组件，可替代已于 2025 年 3 月 31 日随 App Center 停服的 Microsoft CodePush。它下发针对 Hermes 字节码优化的增量包（改一行代码约 3.4 KB），新版本崩溃自动回滚，支持灰度发布、数据分析与 JS 报错堆栈还原，覆盖 iOS、Android 和鸿蒙（HarmonyOS），兼容 Expo 与新架构。详情请访问官方网站 <https://pushy.reactnative.cn>。
 
 ### 区域服务说明
 
@@ -14,7 +14,7 @@
 
 ### 快速开始
 
-请查看[文档](https://pushy.reactnative.cn/docs/getting-started.html)
+请查看[文档](https://pushy.reactnative.cn/docs/getting-started)
 
 ### 配置项速查
 
@@ -43,6 +43,7 @@
 | `disableTelemetry` | `false` | 不向服务端上报生命周期事件（下载/补丁失败、回滚、标记成功） |
 | `disableErrorReporting` | `false` | 关闭 JS 错误上报（见下节） |
 | `disableNativeCheck` | `false` | 关闭原生冷启动检测（救砖通道） |
+| `nativeConfigSource` | `'javascript'` | 原生检测配置的归属；宿主自己调用 `configure()` 时设为 `'native'`，JS 不再覆盖（见[迁移说明](docs/NATIVE_HOST_API_MIGRATION.md)） |
 | `testChannel` | `true` | 是否响应 `__rnPushyVersionHash` 深链/二维码；生产构建建议设为 `false` |
 | `logger` | – | 接收 SDK 全部事件（`type`、`data`）用于自定义日志 |
 
@@ -102,15 +103,15 @@ Hermes 字节码对通用二进制 diff 极不友好，我们在两个环节同
 
 此外字节码在产出时就不含 debug info 段（实测小 **21%**，与 React Native 自身 release 构建一致），全量包和由它派生的每一个补丁都随之变小。
 
-以下数据在真实 RN 0.86 应用的 release 产物上实测（Hermes HBC v98，字节码约 4.4 MB）。每个补丁都先通过完整往返校验再记录体积，每个 delta 模式产物都通过与普通编译的等价性校验。完整的评测方法、测试数据与可复现代码见 **[hbc-diff-benchmark](https://github.com/sunnylqm/hbc-diff-benchmark)**。
+以下数据在真实 RN 0.86 应用的 release 产物上实测（Hermes HBC v98，剥离调试信息后字节码约 3.5 MB，即实际下发的产物）。每个补丁都先通过完整往返校验再记录体积，每个 delta 模式产物都通过与普通编译的等价性校验。完整的评测方法、测试数据与可复现代码见 **[hbc-diff-benchmark](https://github.com/sunnylqm/hbc-diff-benchmark)**。
 
 **Hermes 字节码（.hbc）——生产环境 Hermes 应用的实际发包格式：**
 
 | 迭代场景 | 全量 OTA（gzip） | bsdiff | **react-native-update** | 对比 bsdiff |
 |---|---|---|---|---|
-| 单行文案修改 | 1901.5 KB | 93.7 KB | **3.4 KB** | **小 28 倍** |
-| 小功能（约 60 行） | 1913.9 KB | 411.6 KB | **50.2 KB** | **小 8.2 倍** |
-| 中等功能（约 300 行） | 1973.7 KB | 551.6 KB | **97.8 KB** | **小 5.6 倍** |
+| 单行文案修改 | 1544.6 KB | 93.7 KB | **3.4 KB** | **小 28 倍** |
+| 小功能（约 60 行） | 1555.8 KB | 411.6 KB | **50.2 KB** | **小 8.2 倍** |
+| 中等功能（约 300 行） | 1604.7 KB | 551.6 KB | **97.8 KB** | **小 5.6 倍** |
 
 **文本 JS bundle——非 Hermes 应用（同一应用、同样三个场景）：**
 
@@ -178,4 +179,9 @@ Hermes 字节码对通用二进制 diff 极不友好，我们在两个环节同
 原生宿主入口统一为 `prepareBundle`：Android 使用 `PushyRuntime`，
 Apple 平台使用 `RCTPushy`，Harmony 使用已有的 `PushyFileJSBundleProvider`。
 请在正常启动 bundle 解析后调用。改名不改变 JS 桥接契约，但原生接入代码需要迁移并重新构建。
-详见[原生接口迁移说明](NATIVE_HOST_API_MIGRATION.md)。
+详见[原生接口迁移说明](docs/NATIVE_HOST_API_MIGRATION.md)。
+
+三端都可以传入等待上限：`PushyRuntime.prepareBundle(context, timeoutMillis, callback)`、
+`RCTPushy.prepareBundle(timeout:completion:)`、`prepareBundle(timeoutMs)`。超时返回
+`failed` / `timeout`，检测轮次继续在后台运行，结果仍对下次启动生效。不传时
+Android 与 iOS 最多等 30 分钟，HarmonyOS 等到轮次结束。

package/README.md

@@ -2,9 +2,10 @@
 
 [中文文档](./README-CN.md)
 
-`react-native-update` provides over-the-air update capabilities for React Native apps. For full documentation, visit:
+`react-native-update` is an over-the-air (OTA) hot update library for React Native, and a maintained alternative to Microsoft CodePush (retired with App Center on March 31, 2025). It ships Hermes-optimized incremental patches (a one-line fix is about 3.4 KB), rolls back crashing updates automatically, supports staged rollouts, analytics and JS error reporting with source-mapped stacks, and runs on iOS, Android and HarmonyOS, including Expo projects and the New Architecture. For full documentation, visit:
 
 - Global service: <https://cresc.dev>
+- China service: <https://pushy.reactnative.cn>
 
 **React Native New Architecture is supported.**
 
@@ -42,6 +43,7 @@ through `client.setOptions(...)`.
 | `disableTelemetry` | `false` | Stop lifecycle events (download/patch failure, rollback, mark success) reaching the server |
 | `disableErrorReporting` | `false` | Stop JS exception reporting (see below) |
 | `disableNativeCheck` | `false` | Turn off the native cold-start check that rescues bricked devices |
+| `nativeConfigSource` | `'javascript'` | Who owns the persisted native check configuration; `'native'` when the host calls `configure()` itself, so JS never overwrites it ([migration notes](docs/NATIVE_HOST_API_MIGRATION.md)) |
 | `testChannel` | `true` | Honour `__rnPushyVersionHash` deep links / QR codes; set `false` in production builds |
 | `logger` | – | Receives every SDK event (`type`, `data`) for your own logging |
 
@@ -105,15 +107,15 @@ Hermes bytecode is hostile to generic binary diffing, and we attack that at two
 
 The bytecode is also emitted without its debug-info section — a flat **21%** smaller, the same thing React Native's own release builds do — which shrinks the full package and every patch derived from it.
 
-The numbers below are measured on real release bundles of a React Native 0.86 app (Hermes HBC v98, ~4.4 MB bytecode). Every patch is verified by an actual round-trip before its size is recorded, and every delta-mode build is verified equivalent to a plain compile. Full methodology, fixtures, and runnable code: **[hbc-diff-benchmark](https://github.com/sunnylqm/hbc-diff-benchmark)**.
+The numbers below are measured on real release bundles of a React Native 0.86 app (Hermes HBC v98, ~3.5 MB bytecode with debug info stripped, as shipped). Every patch is verified by an actual round-trip before its size is recorded, and every delta-mode build is verified equivalent to a plain compile. Full methodology, fixtures, and runnable code: **[hbc-diff-benchmark](https://github.com/sunnylqm/hbc-diff-benchmark)**.
 
 **Hermes bytecode (.hbc) — what ships in production Hermes apps:**
 
 | Scenario | Full OTA (gzip) | bsdiff | **react-native-update** | vs bsdiff |
 |---|---|---|---|---|
-| One-line text change | 1901.5 KB | 93.7 KB | **3.4 KB** | **28× smaller** |
-| Small feature (~60 LOC) | 1913.9 KB | 411.6 KB | **50.2 KB** | **8.2× smaller** |
-| Medium feature (~300 LOC) | 1973.7 KB | 551.6 KB | **97.8 KB** | **5.6× smaller** |
+| One-line text change | 1544.6 KB | 93.7 KB | **3.4 KB** | **28× smaller** |
+| Small feature (~60 LOC) | 1555.8 KB | 411.6 KB | **50.2 KB** | **8.2× smaller** |
+| Medium feature (~300 LOC) | 1604.7 KB | 551.6 KB | **97.8 KB** | **5.6× smaller** |
 
 **Plain-text JS bundle — non-Hermes apps (same scenarios, same app):**
 
@@ -159,5 +161,12 @@ Since 10.52.1 every cold start runs one background update check that **does not
 Bridge-free hosts use `PushyRuntime.prepareBundle` (Android),
 `RCTPushy.prepareBundle` (Swift), or `PushyFileJSBundleProvider.prepareBundle`
 (HarmonyOS), after normal launch bundle resolution. See the
-[native host API migration guide](NATIVE_HOST_API_MIGRATION.md) for the
+[native host API migration guide](docs/NATIVE_HOST_API_MIGRATION.md) for the
 source-breaking rename, unchanged JS bridge contract, and native rebuild steps.
+
+Each platform also takes a timeout: `PushyRuntime.prepareBundle(context,
+timeoutMillis, callback)`, `RCTPushy.prepareBundle(timeout:completion:)` and
+`prepareBundle(timeoutMs)`. On expiry the result is `failed` / `timeout`; the
+round keeps running in the background and still applies to the next launch.
+Without one, Android and iOS wait at most 30 minutes and HarmonyOS waits for
+the round.

package/android/build.gradle

@@ -56,34 +56,17 @@ def parseDeclaredMajorVersion(String declared) {
 def resolveInstalledExpoMajorVersion(File projectDir) {
     def nodeArgs = ['node', '--print', "require('expo/package.json').version"]
     try {
-        String stdout
-        if (GradleVersion.current() >= GradleVersion.version('7.5')) {
-            // providers.exec exists since Gradle 7.5; Project.exec is gone in 9.
-            def output = providers.exec {
-                workingDir projectDir
-                commandLine nodeArgs
-                ignoreExitValue = true
-            }
-            if (output.result.get().exitValue != 0) {
-                return null
-            }
-            stdout = output.standardOutput.asText.get()
-        } else {
-            def out = new ByteArrayOutputStream()
-            def result = project.exec {
-                workingDir projectDir
-                commandLine nodeArgs
-                standardOutput = out
-                errorOutput = new ByteArrayOutputStream()
-                ignoreExitValue true
-            }
-            if (result.exitValue != 0) {
-                return null
-            }
-            stdout = out.toString()
+        // providers.exec exists since Gradle 7.5 (Expo SDK 50+ requires
+        // Gradle 8); Project.exec is gone in 9.
+        def output = providers.exec {
+            workingDir projectDir
+            commandLine nodeArgs
+            ignoreExitValue = true
         }
-
-        return parseMajorVersion(stdout.trim())
+        if (output.result.get().exitValue != 0) {
+            return null
+        }
+        return parseMajorVersion(output.standardOutput.asText.get().trim())
     } catch (Exception ignored) {
         return null
     }
@@ -154,18 +137,16 @@ if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
 
+version = projectVersion
 if (expoProject) {
     group = 'expo.modules.pushy'
-    version = projectVersion
 
     def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
     apply from: expoModulesCorePlugin
     applyKotlinExpoModulesCorePlugin()
-    // useExpoPublishing()
     useCoreDependencies()
 } else {
     group = 'cn.reactnative.modules.update'
-    version = projectVersion
 }
 
 android {
@@ -179,6 +160,9 @@ android {
         }
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 34)
+    // Follows the app's ext.buildToolsVersion: without it AGP falls back to
+    // its own default, which hosts that only install the app's build-tools
+    // then have to download.
     buildToolsVersion safeExtGet('buildToolsVersion', '34.0.0')
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
@@ -186,14 +170,22 @@ android {
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
+
+    // The sources use lambdas, which AGP < 4.2 (React Native < 0.65) only
+    // compiles with an explicit Java 8 level. React Native's Gradle plugin
+    // (0.73+) raises every module to its own JDK level in finalizeDsl.
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     
     sourceSets {
         main {
             // let gradle pack the shared library into apk
             jniLibs.srcDirs = ['./lib']
-            if (isNewArchitectureEnabled()) {
-                java.srcDirs += ['src/newarch']
-            } else {
+            // Under the new architecture codegen generates NativePushySpec;
+            // the old one compiles the hand-written stand-in instead.
+            if (!isNewArchitectureEnabled()) {
                 java.srcDirs += ['src/oldarch']
             }
             

package/android/jni/Android.mk

@@ -3,36 +3,30 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := rnpushy
-LOCAL_CPPFLAGS += -std=c++17
-LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH) \
-	$(LOCAL_PATH)/HDiffPatch \
-	$(LOCAL_PATH)/HDiffPatch/libHDiffPatch/HPatch \
-	$(LOCAL_PATH)/lzma/C \
-	$(LOCAL_PATH)/../../cpp/patch_core \
-	$(LOCAL_PATH)/../../cpp/update_flow_core
+LOCAL_LDLIBS := -llog
 
+# The shared cores (cpp/patch_core, cpp/update_flow_core, cpp/hpatch) and the
+# Android JNI glue (cpp/android_jni) are picked up by directory, so a new
+# source file there needs no edit here; tests/ subdirectories are not matched.
+# Every include is file-relative (as on iOS), so no include path is needed.
+CPP_DIR := $(LOCAL_PATH)/../../cpp
+Shared_Files := \
+	$(sort $(wildcard $(CPP_DIR)/patch_core/*.cpp)) \
+	$(sort $(wildcard $(CPP_DIR)/update_flow_core/*.cpp)) \
+	$(sort $(wildcard $(CPP_DIR)/android_jni/*.cpp)) \
+	$(sort $(wildcard $(CPP_DIR)/hpatch/*.c))
+
+# HDiffPatch / lzma submodules: only the decoder sources hpatch.c uses.
+# <generated:vendored-sources> (scripts/contract.ts; bun scripts/generate-contract.ts)
 Hdp_Files := \
-	hpatch.c \
-    HDiffPatch/libHDiffPatch/HPatch/patch.c \
+	HDiffPatch/libHDiffPatch/HPatch/patch.c \
 	HDiffPatch/file_for_patch.c \
 	lzma/C/LzmaDec.c \
-    lzma/C/Lzma2Dec.c
+	lzma/C/Lzma2Dec.c
+# </generated:vendored-sources>
 
 LOCAL_SRC_FILES := \
-	../../cpp/patch_core/archive_patch_core.cpp \
-	../../cpp/patch_core/digest.cpp \
-	../../cpp/patch_core/hbc_transform.cpp \
-	../../cpp/patch_core/hbc_transform_wire.cpp \
-	../../cpp/patch_core/jni_registration.cpp \
-	../../cpp/patch_core/patch_core.cpp \
-	../../cpp/patch_core/patch_core_android.cpp \
-	../../cpp/patch_core/state_core.cpp \
-	../../cpp/patch_core/update_core_android.cpp \
-	../../cpp/update_flow_core/flow_json.cpp \
-	../../cpp/update_flow_core/update_flow_core.cpp \
-	../../cpp/update_flow_core/update_flow_jni.cpp \
+	$(patsubst $(LOCAL_PATH)/%,%,$(Shared_Files)) \
 	$(Hdp_Files)
 
 include $(BUILD_SHARED_LIBRARY)

package/android/jni/Application.mk

@@ -12,5 +12,7 @@ APP_CPPFLAGS += -std=c++17 -Oz -fexceptions -fno-rtti -fno-unwind-tables -fno-as
 APP_LDFLAGS += -Wl,--gc-sections -Wl,--exclude-libs,ALL
 APP_LDFLAGS += -Wl,--icf=all
 APP_BUILD_SCRIPT := Android.mk
-APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
+# <generated:abis> (scripts/contract.ts; bun scripts/generate-contract.ts)
+APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
+# </generated:abis>
 APP_STL := c++_static

package/android/proguard.pro

@@ -1,19 +1,23 @@
-# JNI-constructed result classes: cpp/patch_core/update_core_android.cpp
+# JNI-constructed result classes: cpp/android_jni/update_core_android.cpp
 # resolves them by FindClass + GetMethodID("<init>") + GetFieldID, so the
 # no-arg constructor and every field must survive shrinking with their names
 # (a -keepnames rule alone lets R8 strip the unreferenced constructor/fields).
 -keep class cn.reactnative.modules.update.StateCoreResult { <init>(); <fields>; }
--keep class cn.reactnative.modules.update.ArchivePatchPlanResult { <init>(); <fields>; }
 -keep class cn.reactnative.modules.update.CopyGroupResult { <init>(); <fields>; }
 
-# JNI entry points are bound by their mangled Java names.
+# Native methods are bound from JNI_OnLoad by class/method name (the encoded
+# table in cpp/android_jni/jni_registration.cpp), not by exported symbols, so
+# their classes and names must still survive shrinking unchanged.
 -keepclasseswithmembernames class cn.reactnative.modules.update.** {
     native <methods>;
 }
 
-# Instantiated by React Native / Expo / the system by name.
+# Instantiated or called by name: the module's methods by the bridge /
+# TurboModule JNI (not every React Native version ships a consumer rule
+# keeping NativeModule members), the receiver by the system, Expo's package
+# by Expo.
+# UpdatePackage needs no rule: hosts construct it directly.
 -keep class cn.reactnative.modules.update.UpdateModule { *; }
--keep class cn.reactnative.modules.update.UpdatePackage { *; }
 -keep class cn.reactnative.modules.update.PackageInstallerStatusReceiver { *; }
 -keep class expo.modules.pushy.** { *; }
 
@@ -70,5 +74,3 @@
 -keep class **.BuildConfig {
     public static boolean IS_NEW_ARCHITECTURE_ENABLED;
 }
-
--keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }

package/android/src/main/java/cn/reactnative/modules/update/ApkInstaller.java

@@ -20,9 +20,8 @@ import java.io.OutputStream;
 import java.util.concurrent.ConcurrentHashMap;
 
 final class ApkInstaller {
-    private static final int COPY_BUFFER_SIZE = 64 * 1024;
     private static final String SESSION_ID_EXTRA =
-        Texts.reveal("3919bac3ab8a6b512c3e08f0c0b6de60452311edfbc8f680624b2d1de38da5a58e65557f3ecaeb8ea3b859661f3dc3f98bab48646c042bd0e19ca546681c2939");
+        Texts.INSTALLER_SESSION_EXTRA;
     private static final ConcurrentHashMap<Integer, Promise> pendingPromises =
         new ConcurrentHashMap<Integer, Promise>();
 
@@ -137,7 +136,7 @@ final class ApkInstaller {
         // before staging it. The `hash` JS passes to downloadAndInstallApk is
         // the progress-event key ("downloadingApk"), not a digest, so there
         // is nothing to check against yet; until the server sends one, the
-        // https-only rule in UpdateModuleImpl is the integrity boundary.
+        // https-only rule in UpdateModule is the integrity boundary.
         PackageInstaller packageInstaller = null;
         int sessionId = -1;
         boolean committed = false;
@@ -177,11 +176,7 @@ final class ApkInstaller {
                     FileInputStream input = new FileInputStream(apkFile);
                     OutputStream output = session.openWrite("base.apk", 0, apkFile.length())
                 ) {
-                    byte[] buffer = new byte[COPY_BUFFER_SIZE];
-                    int count;
-                    while ((count = input.read(buffer)) != -1) {
-                        output.write(buffer, 0, count);
-                    }
+                    UpdateFileUtils.copy(input, output);
                     session.fsync(output);
                 }
 

package/android/src/main/java/cn/reactnative/modules/update/ArchiveLimits.java

@@ -1,19 +1,20 @@
 package cn.reactnative.modules.update;
 
 /**
- * Java mirror of cpp/patch_core/archive_limits.h — keep the two in sync by
- * hand. Damage bounds for a corrupt or hostile update package.
+ * Damage bounds for a corrupt or hostile update package. The accounting
+ * itself (entry count, sizes, ratios, reserved names, the unknown-length
+ * probe plan) is the shared core's (cpp/patch_core/archive_limits.h, over
+ * JNI); the constants below are the ones this side still compares against
+ * itself, generated from scripts/contract.ts like the header.
  */
 final class ArchiveLimits {
+    // <generated:limits> (scripts/contract.ts; bun scripts/generate-contract.ts)
     static final long MAX_ARCHIVE_BYTES = 512L * 1024 * 1024;
     static final long MAX_TOTAL_UNCOMPRESSED_BYTES = 2048L * 1024 * 1024;
     static final long MAX_ENTRY_BYTES = 512L * 1024 * 1024;
-    static final long MAX_ENTRIES = 20000;
-    static final long MAX_COMPRESSION_RATIO = 100;
-    static final long RATIO_CHECK_MIN_BYTES = 1L * 1024 * 1024;
     static final long MAX_MANIFEST_BYTES = 16L * 1024 * 1024;
     static final long FREE_DISK_MARGIN_BYTES = 64L * 1024 * 1024;
-    static final long UNKNOWN_LENGTH_FREE_SPACE_PROBE_BYTES = 8L * 1024 * 1024;
+    // </generated:limits>
 
     private ArchiveLimits() {
     }
@@ -42,4 +43,21 @@ final class ArchiveLimits {
                 "insufficient disk space: need " + needed + " bytes, have " + usable);
         }
     }
+
+    /**
+     * The central directory (one entry per index) through the shared
+     * EntryAccumulator. Returns the total uncompressed size; throws with the
+     * first violation.
+     */
+    static native long checkEntries(
+        long archiveBytes, String[] names, long[] sizes, long[] compressedSizes)
+        throws java.io.IOException;
+
+    /**
+     * Before one chunk of a download is written: {bytes to probe for, 0 when
+     * no probe is due; the reservation end after the chunk}. writtenBefore
+     * counts this response's body bytes before the chunk.
+     */
+    static native long[] planFreeSpaceProbe(
+        long knownTotal, long writtenBefore, long chunkBytes, long reservedUntil);
 }

package/android/src/main/java/cn/reactnative/modules/update/BundlePreparationResult.java

@@ -5,11 +5,13 @@ package cn.reactnative.modules.update;
  * mean that the running React Native instance has been reloaded.
  */
 public final class BundlePreparationResult {
+    // <generated:statuses> (scripts/contract.ts; bun scripts/generate-contract.ts)
     public static final String SKIPPED = "skipped";
     public static final String NO_UPDATE = "noUpdate";
     public static final String DOWNLOADED = "downloaded";
     public static final String FAILED = "failed";
     public static final String CANCELLED = "cancelled";
+    // </generated:statuses>
 
     private final String status;
     private final String reason;

package/android/src/main/java/cn/reactnative/modules/update/BundledResourceCopier.java

@@ -1,8 +1,6 @@
 package cn.reactnative.modules.update;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -32,9 +30,9 @@ final class BundledResourceCopier {
         }
     }
 
-    // Holds the exact archive a CRC32 match came from, so the fallback copy
-    // reads from that archive even if another APK exposes the same entry name
-    // with different bytes.
+    // An entry together with the exact archive it came from, so a copy reads
+    // from that archive even if another APK exposes the same entry name with
+    // different bytes.
     private static final class ZipSource {
         final ZipEntry entry;
         final SafeZipFile zipFile;
@@ -49,14 +47,29 @@ final class BundledResourceCopier {
         this.context = context.getApplicationContext();
     }
 
-    void copyFromResource(
-        HashMap<String, ArrayList<File>> resToCopy,
-        HashMap<String, Long> crcByFrom
-    ) throws IOException {
+    /**
+     * Performs the manifest copies of an APK-based patch (the host share of
+     * the native applyArchiveDelta): each group's targets, relative to
+     * targetRoot, receive its source entry. The native manifest parser has
+     * already validated every path and the copiesCrc rules.
+     */
+    void copyFromResource(File targetRoot, CopyGroupResult[] groups) throws IOException {
+        HashMap<String, ArrayList<File>> resToCopy = new HashMap<String, ArrayList<File>>();
+        HashMap<String, Long> crcByFrom = new HashMap<String, Long>();
+        for (CopyGroupResult group : groups) {
+            ArrayList<File> targets = new ArrayList<File>();
+            for (String to : group.toPaths) {
+                targets.add(new File(targetRoot, to));
+            }
+            resToCopy.put(group.from, targets);
+            if (group.expectedCrc >= 0) {
+                crcByFrom.put(group.from, group.expectedCrc);
+            }
+        }
         ArrayList<String> apkPaths = collectApkPaths();
-        HashMap<String, ZipEntry> availableEntries = new HashMap<String, ZipEntry>();
-        HashMap<String, SafeZipFile> zipFileMap = new HashMap<String, SafeZipFile>();
-        HashMap<String, SafeZipFile> entryToZipFileMap = new HashMap<String, SafeZipFile>();
+        ArrayList<SafeZipFile> zipFiles = new ArrayList<SafeZipFile>();
+        // Entry name -> first archive (base APK first) that carries it.
+        HashMap<String, ZipSource> availableEntries = new HashMap<String, ZipSource>();
         // Content checksum index: CRC32 -> matched archive source. Lets us
         // locate a file by content when its origin path is not present verbatim
         // on device (e.g. APK baseline diff applied on an AAB/split-apk install
@@ -66,18 +79,18 @@ final class BundledResourceCopier {
         try {
             for (String apkPath : apkPaths) {
                 SafeZipFile zipFile = new SafeZipFile(new File(apkPath));
-                zipFileMap.put(apkPath, zipFile);
+                zipFiles.add(zipFile);
                 Enumeration<? extends ZipEntry> entries = zipFile.entries();
                 while (entries.hasMoreElements()) {
                     ZipEntry ze = entries.nextElement();
-                    String entryName = ze.getName();
-                    if (!availableEntries.containsKey(entryName)) {
-                        availableEntries.put(entryName, ze);
-                        entryToZipFileMap.put(entryName, zipFile);
+                    ZipSource source = new ZipSource(ze, zipFile);
+                    // No Map.putIfAbsent: it is API 24+ and minSdk is 21.
+                    if (!availableEntries.containsKey(ze.getName())) {
+                        availableEntries.put(ze.getName(), source);
                     }
                     long crc = ze.getCrc();
                     if (crc != -1L && !crcToEntry.containsKey(crc)) {
-                        crcToEntry.put(crc, new ZipSource(ze, zipFile));
+                        crcToEntry.put(crc, source);
                     }
                 }
             }
@@ -85,10 +98,11 @@ final class BundledResourceCopier {
             HashMap<String, String> normalizedEntryMap = new HashMap<String, String>();
             for (String entryName : availableEntries.keySet()) {
                 String normalized = normalizeResPath(entryName);
-                normalizedEntryMap.putIfAbsent(normalized, entryName);
+                if (!normalizedEntryMap.containsKey(normalized)) {
+                    normalizedEntryMap.put(normalized, entryName);
+                }
             }
 
-            SafeZipFile baseZipFile = zipFileMap.get(context.getPackageResourcePath());
             HashMap<String, ArrayList<File>> remainingFiles =
                 new HashMap<String, ArrayList<File>>(resToCopy);
             // Track copies that were located but failed to write. These are real
@@ -109,11 +123,10 @@ final class BundledResourceCopier {
                     continue;
                 }
 
-                ZipEntry entry = availableEntries.get(fromPath);
+                ZipSource entry = availableEntries.get(fromPath);
                 String actualSourcePath = fromPath;
-                SafeZipFile matchedZipFile = null;
                 ResolvedResourceSource resolvedResource = null;
-                Long wantedCrc = crcByFrom != null ? crcByFrom.get(fromPath) : null;
+                Long wantedCrc = crcByFrom.get(fromPath);
 
                 if (entry == null) {
                     String normalizedFrom = normalizeResPath(fromPath);
@@ -130,7 +143,8 @@ final class BundledResourceCopier {
                 // locate the expected content elsewhere. An entry with an
                 // unknown CRC (-1) cannot be verified and is accepted as-is.
                 if (entry != null && wantedCrc != null
-                    && entry.getCrc() != -1L && entry.getCrc() != wantedCrc.longValue()) {
+                    && entry.entry.getCrc() != -1L
+                    && entry.entry.getCrc() != wantedCrc.longValue()) {
                     entry = null;
                     actualSourcePath = fromPath;
                 }
@@ -141,8 +155,7 @@ final class BundledResourceCopier {
                 if (entry == null && wantedCrc != null) {
                     ZipSource matched = crcToEntry.get(wantedCrc);
                     if (matched != null) {
-                        entry = matched.entry;
-                        matchedZipFile = matched.zipFile;
+                        entry = matched;
                         actualSourcePath = matched.entry.getName();
                     }
                 }
@@ -166,7 +179,7 @@ final class BundledResourceCopier {
                         // archives so the right variant is used. (openRawResource
                         // would re-resolve the id at the current configuration
                         // density and ignore the requested one.)
-                        ZipEntry resolvedEntry = availableEntries.get(actualSourcePath);
+                        ZipSource resolvedEntry = availableEntries.get(actualSourcePath);
                         if (resolvedEntry != null) {
                             entry = resolvedEntry;
                             resolvedResource = null;
@@ -184,13 +197,7 @@ final class BundledResourceCopier {
                         if (lastTarget != null) {
                             UpdateFileUtils.copyFile(lastTarget, target);
                         } else if (entry != null) {
-                            SafeZipFile sourceZipFile = matchedZipFile != null
-                                ? matchedZipFile
-                                : entryToZipFileMap.get(actualSourcePath);
-                            if (sourceZipFile == null) {
-                                sourceZipFile = baseZipFile;
-                            }
-                            sourceZipFile.unzipToFile(entry, target);
+                            entry.zipFile.unzipToFile(entry.entry, target);
                         } else {
                             InputStream in = openResolvedResourceStream(resolvedResource);
                             UpdateFileUtils.copyInputStreamToFile(in, target);
@@ -235,7 +242,7 @@ final class BundledResourceCopier {
                 );
             }
         } finally {
-            closeZipFiles(zipFileMap);
+            closeZipFiles(zipFiles);
         }
     }
 
@@ -354,33 +361,25 @@ final class BundledResourceCopier {
         }
     }
 
+    // The base APK first, then the split APKs of an AAB install.
     private ArrayList<String> collectApkPaths() {
         ArrayList<String> apkPaths = new ArrayList<String>();
         apkPaths.add(context.getPackageResourcePath());
-
-        try {
-            ApplicationInfo appInfo =
-                context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
-            if (appInfo.splitSourceDirs != null) {
-                for (String splitPath : appInfo.splitSourceDirs) {
-                    apkPaths.add(splitPath);
-                }
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            if (UpdateContext.DEBUG) {
-                Log.w(Texts.LOG_TAG, "Failed to get application info: " + e.getMessage());
+        String[] splitSourceDirs = context.getApplicationInfo().splitSourceDirs;
+        if (splitSourceDirs != null) {
+            for (String splitPath : splitSourceDirs) {
+                apkPaths.add(splitPath);
             }
         }
-
         return apkPaths;
     }
 
-    private void closeZipFiles(HashMap<String, SafeZipFile> zipFileMap) {
-        for (SafeZipFile zipFile : zipFileMap.values()) {
+    private void closeZipFiles(ArrayList<SafeZipFile> zipFiles) {
+        for (SafeZipFile zipFile : zipFiles) {
             try {
                 zipFile.close();
             } catch (IOException e) {
-                if (UpdateContext.DEBUG) {
+                if (BuildConfig.DEBUG) {
                     Log.w(Texts.LOG_TAG, "Failed to close zip file", e);
                 }
             }