commit 80d0f4c66bc4b64e0f3cd1fe6a12db09705b9c4d
author Yurii Zubrytskyi <zyy@google.com> Fri Feb 26 03:53:04 2021 -0500
committer Yurii Zubrytskyi <zyy@google.com> Fri Mar 05 01:42:17 2021 -0800
tree 51849b16d92045ddc70dfc4353098ecded80b671
parent 4183c1d4a75d0caf0e68903b37355849af15df69

[hardening] Switch to hardened libziparchive in system_server

Use the new libziparchive_hardened in all system_server
dependencies to ensure no missing page access can crash
the process

Bug: 160635079
Test: IncrementalService tests + adb install --incremental
Change-Id: I1c664e111b69718cd9c62fc3e0d6a5dc70bed16b

libs/androidfw/Android.bp

diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index aba0f1b..63b831d 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -97,8 +97,8 @@
                 "libincfs",
                 "libutils",
                 "libz",
-                "libziparchive",
             ],
+            static_libs: ["libziparchive_for_incfs"],
             static: {
                 enabled: false,
             },

libs/hwui/Android.bp

diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index d663c52..607ef72 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -388,11 +388,10 @@
         "liblog",
         "libminikin",
         "libz",
-        "libziparchive",
         "libjpeg",
     ],
 
-    static_libs: ["libnativehelper_lazy"],
+    static_libs: ["libnativehelper_lazy", "libziparchive_for_incfs"],
 
     target: {
         android: {