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

Commit fd193e87 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "servicemanager_fuzzer: fix ODR" into main am: f6273276 am: 4479431f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2787220



Change-Id: I62373d867e08f2336dac66931d1a5c0de14458a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 551407ff 4479431f

cmds/servicemanager/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ cc_defaults { 


    shared_libs: [

        "libbase",

        "libbinder", // also contains servicemanager_interface

        "libvintf",

        "libcutils",

        "liblog",
@@ -33,6 +32,21 @@ cc_defaults { 
    ],



    target: {

        android: {

            shared_libs: [

                "libbinder",

                "libutils",

            ],

        },

        host: {

            static_libs: [

                "libbinder",

                "libutils",

            ],

        },

        darwin: {

            enabled: false,

        },

        vendor: {

            exclude_shared_libs: ["libvintf"],

        },