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

Commit 69481edf authored by Tej Singh's avatar Tej Singh Committed by Automerger Merge Worker
Browse files

Merge "Move proto, c++, and test libs to static" into rvc-dev am: fa49ff93... 

Merge "Move proto, c++, and test libs to static" into rvc-dev am: fa49ff93 am: 559989bd am: cb2589b4

Change-Id: I883726f73008c50e955d45df58c89ae05fec79ea
parents 3c5db25f cb2589b4

apex/statsd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ cc_library_shared { 
        "liblog",  // Has a stable abi - should not be copied into apex.

        "libstatssocket",

    ],

    //TODO: is libc++_static correct?

    stl: "libc++_static",

    cflags: [

        "-Wall",

cmds/statsd/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -113,17 +113,18 @@ cc_defaults { 
    static_libs: [

        "libbase",

        "libcutils",

        "libgtest_prod",

        "libprotoutil",

        "libstatsmetadata",

        "libstatslog_statsd",

        "libsysutils",

        "libutils",

        "statsd-aidl-ndk_platform",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libincident",

        "liblog",

        "statsd-aidl-ndk_platform",

    ],

}
@@ -268,10 +269,11 @@ cc_binary { 


    proto: {

        type: "lite",

        static: true,

    },

    stl: "libc++_static",



    shared_libs: [

        "libgtest_prod",

        "libstatssocket",

    ],