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

Commit c2a354be authored by Jiyong Park's avatar Jiyong Park Committed by Android (Google) Code Review
Browse files

Merge "don't include liblog to APEXes" into rvc-dev

parents 575d8c2c 01aa81ce

adb/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ cc_binary { 
        "libcrypto_utils",

        "libcutils_sockets",

        "libdiagnose_usb",

        "liblog",

        "libmdnssd",

        "libminijail",

        "libselinux",
@@ -589,6 +588,7 @@ cc_binary { 
        "libadbd_auth",

        "libadbd_fs",

        "libcrypto",

        "liblog",

    ],



    target: {

liblog/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -117,8 +117,12 @@ cc_library { 
    logtags: ["event.logtags"],

    compile_multilib: "both",

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

        // liblog is exceptionally available to the runtime APEX

        // because the dynamic linker has to use it statically.

        // See b/151051671

        "com.android.runtime",

        // DO NOT add more apex names here

    ],

}

libstats/push_compat/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ cc_defaults { 
    header_libs: ["libstatssocket_headers"],

    static_libs: [

        "libbase",

    ],

    shared_libs: [

        "liblog",

    ],

}