commit f554b33bb9701517b42254df8790f14300672685
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 11 04:00:54 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 11 04:00:54 2024 +0000
tree 4f863da2029cbfffad614e90b5f9fad18bbcb9c9
parent d0867b54f3ab20af2b16565037de6f8e59aa52a5
parent c89b4e4314e8729871bb1e69d197da7446966ffb

Merge "Revert "Only format /data in recovery if user specified a new fstype"" into main

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 \