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

Commit 72d046d8 authored by Jeongik Cha's avatar Jeongik Cha Committed by Automerger Merge Worker
Browse files

Merge "Specify version for aidl_interface explicitly" into sc-dev am: ec53dfa4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13417986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3618d8d417455df1b42c30f4f02f5a82dc23cdcb
parents fcca215b ec53dfa4

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ cc_library_headers { 
    name: "av-headers",

    export_include_dirs: ["include"],

    static_libs: [

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

        "av-types-aidl-cpp",

    ],

    export_static_lib_headers: [

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

        "av-types-aidl-cpp",

    ],

    header_libs: [

        "libaudioclient_aidl_conversion_util",

media/libaaudio/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ cc_test { 
        "libbinder",

        "libcutils",

        "libutils",

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

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

    ],

}

media/libaudioclient/Android.bp

+32 −32
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ cc_library_headers { 
        "libaudiofoundation_headers",

    ],

    static_libs: [

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

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

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "av-types-aidl-cpp",

    ],

    export_static_lib_headers: [

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

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

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "av-types-aidl-cpp",

    ],

    target: {

        darwin: {
@@ -40,11 +40,11 @@ cc_library_shared { 
        "PolicyAidlConversion.cpp"

    ],

    shared_libs: [

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

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

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

        "capture_state_listener-aidl-unstable-cpp",

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "capture_state_listener-aidl-cpp",

        "libaudiofoundation",

        "libaudioclient_aidl_conversion",

        "libaudioutils",
@@ -60,11 +60,11 @@ cc_library_shared { 
    include_dirs: ["system/media/audio_utils/include"],

    export_include_dirs: ["include"],

    export_shared_lib_headers: [

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

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

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

        "capture_state_listener-aidl-unstable-cpp",

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "capture_state_listener-aidl-cpp",

        "libaudiofoundation",

        "libaudioclient_aidl_conversion",

    ],
@@ -100,12 +100,12 @@ cc_library { 
        "TrackPlayerBase.cpp",

    ],

    shared_libs: [

        "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",

        "libaudiofoundation",

        "libaudioutils",
@@ -125,8 +125,8 @@ cc_library { 
        "libvibrator",

    ],

    export_shared_lib_headers: [

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "libbinder",

    ],
@@ -144,15 +144,15 @@ cc_library { 
    ],

    export_header_lib_headers: ["libaudioclient_headers"],

    export_static_lib_headers: [

        "effect-aidl-unstable-cpp",

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

        "effect-aidl-cpp",

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

    ],



    static_libs: [

        "effect-aidl-unstable-cpp",

        "effect-aidl-cpp",

        // for memory heap analysis

        "libc_malloc_debug_backtrace",

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

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

    ],

    cflags: [

        "-Wall",
@@ -213,18 +213,18 @@ cc_library { 
        "libaudioclient_aidl_conversion_util",

    ],

    shared_libs: [

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

        "audioclient-types-aidl-cpp",

        "libbase",

        "libbinder",

        "liblog",

        "libshmemcompat",

        "libutils",

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

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

    ],

    export_shared_lib_headers: [

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

        "audioclient-types-aidl-cpp",

        "libbase",

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

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

    ],

    cflags: [

        "-Wall",

media/libaudiofoundation/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ cc_library_headers { 
        "libmedia_helper_headers",

    ],

    static_libs: [

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

        "audioclient-types-aidl-cpp",

    ],

    export_static_lib_headers: [

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

        "audioclient-types-aidl-cpp",

    ],

    host_supported: true,

    target: {
@@ -43,7 +43,7 @@ cc_library { 
    ],



    shared_libs: [

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

        "audioclient-types-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "libaudioutils",

        "libbase",
@@ -54,7 +54,7 @@ cc_library { 
    ],



    export_shared_lib_headers: [

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

        "audioclient-types-aidl-cpp",

        "libaudioclient_aidl_conversion",

    ],

media/libaudiohal/impl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ cc_defaults { 
        "android.hardware.audio.common-util",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

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

        "av-types-aidl-cpp",

        "libaudiofoundation",

        "libaudiohal_deathhandler",

        "libaudioutils",