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

Commit 9644a837 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b7 am: f81d1979 

am: f096e2d9

Change-Id: I4a2a84a56fb772b9223165869e50849642ea29b3
parents 123301b5 f096e2d9

logcat/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ cc_defaults { 
    shared_libs: [

        "libbase",

        "libcutils",

        "liblog",

        "libpcrecpp",

    ],

    static_libs: ["liblog"],

    logtags: ["event.logtags"],

}

logcat/tests/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ cc_benchmark { 
cc_test {

    name: "logcat-unit-tests",

    defaults: ["logcat-tests-defaults"],

    shared_libs: [

        "liblog",

        "libbase",

    ],

    shared_libs: ["libbase"],

    static_libs: ["liblog"],

    srcs: [

        "logcat_test.cpp",

        "logcatd_test.cpp",

logd/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -63,11 +63,13 @@ cc_binary { 


    srcs: ["main.cpp"],



    static_libs: ["liblogd"],

    static_libs: [

        "liblog",

        "liblogd",

    ],



    shared_libs: [

        "libsysutils",

        "liblog",

        "libcutils",

        "libbase",

        "libpackagelistparser",

logd/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ cc_defaults { 
    shared_libs: [

        "libbase",

        "libcutils",

        "liblog",

        "libselinux",

    ],

    static_libs: ["liblog"],

}



// Build tests for the logger. Run with: