Merge "[hardening] Switch to hardened libziparchive in system_server" into sc-dev

core/jni/Android.bp

@@ -69,10 +69,9 @@ cc_library_shared {
         "liblog",
         "libminikin",
         "libz",
-        "libziparchive",
     ],
 
-    static_libs: ["libnativehelper_lazy"],
+    static_libs: ["libnativehelper_lazy", "libziparchive_for_incfs", ],
 
     export_include_dirs: [
         ".",

libs/androidfw/Android.bp

@@ -97,8 +97,8 @@ cc_library {
                 "libincfs",
                 "libutils",
                 "libz",
-                "libziparchive",
             ],
+            static_libs: ["libziparchive_for_incfs"],
             static: {
                 enabled: false,
             },

libs/hwui/Android.bp

@@ -388,11 +388,10 @@ cc_defaults {
         "liblog",
         "libminikin",
         "libz",
-        "libziparchive",
         "libjpeg",
     ],
 
-    static_libs: ["libnativehelper_lazy"],
+    static_libs: ["libnativehelper_lazy", "libziparchive_for_incfs"],
 
     target: {
         android: {

services/incremental/Android.bp

@@ -68,6 +68,7 @@ cc_defaults {
         "libutils",
         "libvold_binder",
         "libc++fs",
+        "libziparchive_for_incfs",
     ],
     shared_libs: [
         "libandroidfw",
@@ -77,7 +78,6 @@ cc_defaults {
         "libincfs",
         "liblog",
         "libz",
-        "libziparchive",
     ],
 }