Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1180590c authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Android (Google) Code Review
Browse files

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

parents a61de115 80d0f4c6

core/jni/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ cc_library { 
                "libincfs",

                "libutils",

                "libz",

                "libziparchive",

            ],

            static_libs: ["libziparchive_for_incfs"],

            static: {

                enabled: false,

            },

libs/hwui/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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",

    ],

}