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

Commit 7d717ec0 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

libaudiohal@aidl: Refactor Android.bp files and reformat tests

Refactor definitions in Android.bp to minimize duplicates.

Enable clang-format for libaudiohal tests.

Bug: 280527932
Test: m
Change-Id: I5596f39268c3a67298eb13deda89f072b69b6fbb
parent b58193e3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
               media/libmediatranscoding/
               services/mediatranscoding/
               media/libaudioclient/tests/
               media/libaudiohal/tests/
+32 −27
Original line number Diff line number Diff line
@@ -240,15 +240,44 @@ cc_library_shared {
    ]
}

cc_library_shared {
    name: "libaudiohal@aidl",
cc_defaults {
    name: "libaudiohal_aidl_default",
    defaults: [
        "libaudiohal_default",
        "latest_android_hardware_audio_common_ndk_shared",
        "latest_android_hardware_audio_core_ndk_shared",
        "latest_android_hardware_audio_effect_ndk_shared",
        "latest_android_media_audio_common_types_ndk_shared",
    ],
    shared_libs: [
        "android.hardware.common-V2-ndk",
        "android.hardware.common.fmq-V1-ndk",
        "libaudio_aidl_conversion_common_cpp",
        "libaudio_aidl_conversion_common_ndk",
        "libaudio_aidl_conversion_common_ndk_cpp",
        "libaudio_aidl_conversion_core_ndk",
        "libaudio_aidl_conversion_effect_ndk",
        "libaudioaidlcommon",
        "libbinder_ndk",
    ],
    header_libs: [
        "libaudio_system_headers",
        "libeffectsconfig_headers",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-Wthread-safety",
        "-DBACKEND_CPP_NDK",
    ],
}

cc_library_shared {
    name: "libaudiohal@aidl",
    defaults: [
        "libaudiohal_default",
        "libaudiohal_aidl_default",
    ],
    srcs: [
        "DeviceHalAidl.cpp",
        "DevicesFactoryHalEntry.cpp",
@@ -277,30 +306,6 @@ cc_library_shared {
        "StreamHalAidl.cpp",
        ":audio_effectproxy_src_files"
    ],
    static_libs: [
        "android.hardware.common-V2-ndk",
        "android.hardware.common.fmq-V1-ndk",
    ],
    shared_libs: [
        "libaudio_aidl_conversion_common_cpp",
        "libaudio_aidl_conversion_common_ndk",
        "libaudio_aidl_conversion_common_ndk_cpp",
        "libaudio_aidl_conversion_core_ndk",
        "libaudio_aidl_conversion_effect_ndk",
        "libaudioaidlcommon",
        "libbinder_ndk",
    ],
    header_libs: [
        "libaudio_system_headers",
        "libeffectsconfig_headers",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-Wthread-safety",
        "-DBACKEND_CPP_NDK",
    ],
}

filegroup {
+8 −25
Original line number Diff line number Diff line
@@ -21,34 +21,24 @@ package {
}

cc_defaults {
    name: "AudioHalTestDefaults",
    name: "libaudiohal_aidl_test_default",
    test_suites: ["device-tests"],
    defaults: [
        "latest_android_media_audio_common_types_ndk_shared",
    ],
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-Wthread-safety",
        "-DBACKEND_NDK",
        "libaudiohal_default",
        "libaudiohal_aidl_default",
    ],

    shared_libs: [
        "audioclient-types-aidl-cpp",
        "libaudio_aidl_conversion_common_ndk",
        "libaudiohal",
        "liblog",
        "libutils",
        "libvibrator",
    ],
}

cc_test {
    name: "EffectsFactoryHalInterfaceTest",
    srcs: ["EffectsFactoryHalInterface_test.cpp"],
    defaults: ["AudioHalTestDefaults"],
    header_libs: ["libaudiohal_headers"],
    defaults: ["libaudiohal_aidl_test_default"],
    shared_libs: [
        "libvibrator",
    ],
}

cc_test {
@@ -58,15 +48,8 @@ cc_test {
        ":audio_effectproxy_src_files",
    ],
    defaults: [
        "AudioHalTestDefaults",
        "latest_android_hardware_audio_effect_ndk_shared",
        "libaudiohal_default",
        "libaudiohal_aidl_test_default",
        "use_libaidlvintf_gtest_helper_static",
    ],
    shared_libs: [
        "android.hardware.common.fmq-V1-ndk",
        "libbinder_ndk",
        "libfmq",
    ],
    header_libs: ["libaudiohalimpl_headers"],
}