commit 036eb4a89d7226c98ae2f8a2ded32f5aa77208a3
author Elliott Hughes <enh@google.com> Mon Jan 08 23:37:06 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 08 23:37:06 2024 +0000
tree 4f863da2029cbfffad614e90b5f9fad18bbcb9c9
parent a5c8b4e7394e7c81cdc65280d18099a28e8c5b8e
parent 81ce5cf3bfd26b9f364c03d8c6300775155ab749

Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459 am: 81ce5cf3bf

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2901147

Change-Id: I73af8326b9406e4514a71f50fc1c975636a4f683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

updater/Android.bp

diff --git a/updater/Android.bp b/updater/Android.bp
index 35debaa..4fc3c49 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -44,7 +44,7 @@
         "libbrotli",
         "libbz",
         "libziparchive",
-        "libz",
+        "libz_stable",
         "libbase",
         "libcrypto_utils",
         "libcutils",

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index bb1c07d..2fd5639 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -42,7 +42,7 @@
     libbrotli \
     libbz \
     libziparchive \
-    libz \
+    libz_stable \
     libbase \
     libcrypto_static \
     libcrypto_utils \