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

Commit 4d84f7fa authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Fix ODR violation" am: ebfd2a46 am: 4a2b31f2 

am: aaab53f5

Change-Id: Ife964deca937026ca98ea6901ed36c99029afd51
parents 5cbd79b2 aaab53f5

init/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -269,11 +269,13 @@ cc_binary { 
    shared_libs: [

        "libcutils",

        "libhidl-gen-utils",

        "libjsoncpp",

        "liblog",

        "libprocessgroup",

        "libprotobuf-cpp-lite",

    ],

    header_libs: [

        "libjsoncpp_headers",

    ],

    srcs: [

        "action.cpp",

        "action_manager.cpp",