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

Commit f07d6d2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Specify version for aidl_interface explicitly" into sc-dev

parents a1a6d615 a01ed788

media/libaudioclient/fuzzer/Android.bp

+9 −9
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ cc_fuzz { 
    ],

    static_libs: [

        "android.hardware.audio.common@7.0-enums",

        "effect-aidl-unstable-cpp",

        "effect-aidl-cpp",

        "libaudioclient",

        "libbase",

        "libcgrouprc",
@@ -33,16 +33,16 @@ cc_fuzz { 
        "libmediametricsservice",

        "libmedia_helper",

        "libprocessgroup",

        "shared-file-region-aidl-unstable-cpp",

        "shared-file-region-aidl-cpp",

    ],

    shared_libs: [

        "android.hardware.audio.common-util",

        "audioclient-types-aidl-unstable-cpp",

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

        "audiopolicy-types-aidl-unstable-cpp",

        "av-types-aidl-unstable-cpp",

        "capture_state_listener-aidl-unstable-cpp",

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "av-types-aidl-cpp",

        "capture_state_listener-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "libaudioflinger",

        "libaudiofoundation",
@@ -55,7 +55,7 @@ cc_fuzz { 
        "libnblog",

        "libutils",

        "libxml2",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],

    header_libs: [

        "libaudiofoundation_headers",

media/libmediametrics/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ cc_library { 
        "libcutils",

        "liblog",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],



    export_include_dirs: ["include"],

services/mediametrics/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ cc_binary { 
        "libmediametricsservice",

        "libmediautils",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],

    header_libs: [

        "libaudioutils_headers",
@@ -143,7 +143,7 @@ cc_library { 
    },



    shared_libs: [

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

        "libbase", // android logging

        "libbinder",

        "libcutils",

services/mediametrics/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ cc_fuzz { 
        "libstagefright",

        "libstatslog",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],



    include_dirs: [

services/mediametrics/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ cc_test { 
        "libmediametricsservice",

        "libmediautils",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],



    header_libs: [