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

Commit 3d39f42d authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "frameworks/av: Fix audio Android.bp files" into main

parents 27aec709 a159e4b9

media/audio/aconfig/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ cc_aconfig_library { 
    // TODO(b/316909431) native_bridge_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

        "com.android.media",

        "com.android.media.swcodec",

        "com.android.btservices",

    ],

    min_sdk_version: "29",

}

media/audioaidlconversion/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ cc_library_headers { 
cc_defaults {

    name: "audio_aidl_conversion_common_default_cpp",

    shared_libs: [

        "framework-permission-aidl-cpp",

        "libbinder",

        "libshmemcompat",

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

        "framework-permission-aidl-cpp",

    ],

    export_shared_lib_headers: [

        "shared-file-region-aidl-cpp",
@@ -94,8 +94,8 @@ cc_defaults { 
    ],

    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

            "unsigned-integer-overflow",

        ],

    },

    target: {
@@ -148,8 +148,8 @@ cc_library { 
        "latest_android_media_audio_common_types_ndk_shared",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libbase",

        "libbinder_ndk",

    ],

    static_libs: [

        "libaudioaidlcommon",
@@ -182,8 +182,8 @@ cc_library { 
    ],

    shared_libs: [

        "libaudio_aidl_conversion_common_ndk",

        "libbinder_ndk",

        "libbase",

        "libbinder_ndk",

    ],

    cflags: [

        "-DBACKEND_NDK",
@@ -213,8 +213,8 @@ cc_library { 
    ],

    shared_libs: [

        "libaudio_aidl_conversion_common_ndk",

        "libbinder_ndk",

        "libbase",

        "libbinder_ndk",

    ],

    cflags: [

        "-DBACKEND_NDK",
@@ -238,8 +238,8 @@ cc_library { 
        "latest_android_media_audio_common_types_ndk_shared",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libbase",

        "libbinder_ndk",

    ],

    cflags: [

        "-DBACKEND_CPP_NDK",

media/audioaidlconversion/tests/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ cc_defaults { 
    ],

    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

            "unsigned-integer-overflow",

        ],

    },

}
@@ -26,8 +26,8 @@ cc_test { 
    name: "audio_aidl_ndk_conversion_tests",



    defaults: [

        "latest_android_media_audio_common_types_ndk_static",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

        "libaudio_aidl_conversion_tests_defaults",

    ],

    srcs: ["audio_aidl_ndk_conversion_tests.cpp"],

media/audioserver/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ cc_binary { 
    ],



    defaults: [

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

        "latest_android_media_audio_common_types_cpp_shared",

        "libaaudioservice_dependencies",

        "libaudioflinger_dependencies",

        "libaudiopolicyservice_dependencies",

        "latest_android_media_audio_common_types_cpp_shared",

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

    ],



    static_libs: [

media/libaaudio/fuzzer/Android.bp

+19 −19
Original line number Diff line number Diff line
@@ -36,37 +36,37 @@ cc_fuzz { 
        "libaaudio_headers",

    ],

    shared_libs: [

        "libbinder",

        "com.android.media.aaudio-aconfig-cc",

        "libaudio_aidl_conversion_common_cpp",

        "libaudioclient_aidl_conversion",

        "libaudiomanager",

        "libaudiopolicy",

        "libaudioclient_aidl_conversion",

        "libaudio_aidl_conversion_common_cpp",

        "libbinder",

        "libutils",

        "com.android.media.aaudio-aconfig-cc",

    ],

    static_libs: [

        "liblog",

        "libcutils",

        "aaudio-aidl-cpp",

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "av-types-aidl-cpp",

        "framework-permission-aidl-cpp",

        "libaaudio",

        "libjsoncpp",

        "libaaudio_internal",

        "libaudioclient",

        "libaudioutils",

        "libbase_ndk",

        "libcgrouprc",

        "libaudioutils",

        "libaudioclient",

        "aaudio-aidl-cpp",

        "libcgrouprc_format",

        "libcutils",

        "libjsoncpp",

        "liblog",

        "libmedia_helper",

        "libmediametrics",

        "libprocessgroup",

        "av-types-aidl-cpp",

        "libaaudio_internal",

        "libcgrouprc_format",

        "audiopolicy-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "audioclient-types-aidl-cpp",

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

        "framework-permission-aidl-cpp",

        "mediametricsservice-aidl-cpp",

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

    ],

    fuzz_config: {

        cc: [