From ec8ef38ad96760062300f993fa2ebb90a5fc15ea Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Wed, 9 Feb 2022 00:23:14 +0000 Subject: [PATCH] audio: Add android.hardware.audio[.common]@7.1-util modules android.hardware.audio.common@7.1-util and android.hardware.audio@7.1-util utilize the 7.1 XSD enums conversion library and thus can work with the new enum strings added in 7.1 Bug: 218504031 Test: atest VtsHalAudioV7_1TargetTest Test: atest android.hardware.audio.common@7.0-util_tests Test: atest android.hardware.audio.common@7.1-util_tests Test: atest android.hardware.audio@7.0-util_tests Test: atest android.hardware.audio@7.1-util_tests Change-Id: Icc5a354cdc2e377a2a2424c28377bcb0ba05bf4e (cherry picked from commit fa4a4f8da7d8a8ba74b781e96a515f6049cd5073) Merged-In: Icc5a354cdc2e377a2a2424c28377bcb0ba05bf4e --- audio/common/all-versions/default/Android.bp | 54 +++++++++++++++++++ .../all-versions/default/HidlUtilsCommon.cpp | 4 +- .../common/all-versions/default/TEST_MAPPING | 3 ++ .../default/tests/hidlutils_tests.cpp | 4 +- audio/core/all-versions/default/Android.bp | 4 +- audio/core/all-versions/default/TEST_MAPPING | 3 ++ .../core/all-versions/default/util/Android.bp | 53 ++++++++++++++++++ .../default/util/tests/coreutils_tests.cpp | 8 +-- .../all-versions/vts/functional/Android.bp | 2 +- 9 files changed, 124 insertions(+), 11 deletions(-) diff --git a/audio/common/all-versions/default/Android.bp b/audio/common/all-versions/default/Android.bp index 8f557449f1..a25565d40c 100644 --- a/audio/common/all-versions/default/Android.bp +++ b/audio/common/all-versions/default/Android.bp @@ -157,6 +157,28 @@ cc_library { ], } +cc_library { + name: "android.hardware.audio.common@7.1-util", + defaults: ["android.hardware.audio.common-util_default"], + srcs: [ + "7.0/HidlUtils.cpp", + "HidlUtilsCommon.cpp", + "UuidUtils.cpp", + ], + shared_libs: [ + "android.hardware.audio.common@7.0", + "android.hardware.audio.common@7.1-enums", + "libbase", + ], + cflags: [ + "-DMAJOR_VERSION=7", + "-DMINOR_VERSION=1", + "-DCOMMON_TYPES_MINOR_VERSION=0", + "-DCORE_TYPES_MINOR_VERSION=0", + "-include common/all-versions/VersionMacro.h", + ], +} + // Note: this isn't a VTS test, but rather a unit test // to verify correctness of conversion utilities. cc_test { @@ -214,3 +236,35 @@ cc_test { test_suites: ["device-tests"], } + +cc_test { + name: "android.hardware.audio.common@7.1-util_tests", + defaults: ["android.hardware.audio.common-util_default"], + + srcs: ["tests/hidlutils_tests.cpp"], + + // Use static linking to allow running in presubmit on + // targets that don't have HAL V7.1. + static_libs: [ + "android.hardware.audio.common@7.1-enums", + "android.hardware.audio.common@7.1-util", + "android.hardware.audio.common@7.0", + ], + + shared_libs: [ + "libbase", + "libxml2", + ], + + cflags: [ + "-Werror", + "-Wall", + "-DMAJOR_VERSION=7", + "-DMINOR_VERSION=1", + "-DCOMMON_TYPES_MINOR_VERSION=0", + "-DCORE_TYPES_MINOR_VERSION=0", + "-include common/all-versions/VersionMacro.h", + ], + + test_suites: ["device-tests"], +} diff --git a/audio/common/all-versions/default/HidlUtilsCommon.cpp b/audio/common/all-versions/default/HidlUtilsCommon.cpp index d2da1939f5..bc3d8702c9 100644 --- a/audio/common/all-versions/default/HidlUtilsCommon.cpp +++ b/audio/common/all-versions/default/HidlUtilsCommon.cpp @@ -20,7 +20,7 @@ namespace android { namespace hardware { namespace audio { namespace common { -namespace CPP_VERSION { +namespace COMMON_TYPES_CPP_VERSION { namespace implementation { status_t HidlUtils::audioPortConfigsFromHal(unsigned int numHalConfigs, @@ -51,7 +51,7 @@ status_t HidlUtils::audioPortConfigsToHal(const hidl_vec& confi } } // namespace implementation -} // namespace CPP_VERSION +} // namespace COMMON_TYPES_CPP_VERSION } // namespace common } // namespace audio } // namespace hardware diff --git a/audio/common/all-versions/default/TEST_MAPPING b/audio/common/all-versions/default/TEST_MAPPING index c96511393f..780beeab0d 100644 --- a/audio/common/all-versions/default/TEST_MAPPING +++ b/audio/common/all-versions/default/TEST_MAPPING @@ -5,6 +5,9 @@ }, { "name": "android.hardware.audio.common@7.0-util_tests" + }, + { + "name": "android.hardware.audio.common@7.1-util_tests" } ] } diff --git a/audio/common/all-versions/default/tests/hidlutils_tests.cpp b/audio/common/all-versions/default/tests/hidlutils_tests.cpp index 2749cce748..ec16b0252f 100644 --- a/audio/common/all-versions/default/tests/hidlutils_tests.cpp +++ b/audio/common/all-versions/default/tests/hidlutils_tests.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include PATH(APM_XSD_ENUMS_H_FILENAME) #include #include @@ -32,7 +32,7 @@ using ::android::hardware::hidl_vec; using namespace ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION; using ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION::implementation::HidlUtils; namespace xsd { -using namespace ::android::audio::policy::configuration::V7_0; +using namespace ::android::audio::policy::configuration::CPP_VERSION; } static constexpr audio_channel_mask_t kInvalidHalChannelMask = AUDIO_CHANNEL_INVALID; diff --git a/audio/core/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp index df688fd909..3536561fd3 100644 --- a/audio/core/all-versions/default/Android.bp +++ b/audio/core/all-versions/default/Android.bp @@ -168,10 +168,10 @@ cc_defaults { shared_libs: [ "android.hardware.audio@7.0", "android.hardware.audio@7.1", - "android.hardware.audio@7.0-util", + "android.hardware.audio@7.1-util", "android.hardware.audio.common@7.0", "android.hardware.audio.common@7.1-enums", - "android.hardware.audio.common@7.0-util", + "android.hardware.audio.common@7.1-util", "libbase", ], cflags: [ diff --git a/audio/core/all-versions/default/TEST_MAPPING b/audio/core/all-versions/default/TEST_MAPPING index 1e2944060b..07e98f37d2 100644 --- a/audio/core/all-versions/default/TEST_MAPPING +++ b/audio/core/all-versions/default/TEST_MAPPING @@ -3,6 +3,9 @@ { "name": "android.hardware.audio@7.0-util_tests" }, + { + "name": "android.hardware.audio@7.1-util_tests" + }, { "name": "HalAudioV6_0GeneratorTest" }, diff --git a/audio/core/all-versions/default/util/Android.bp b/audio/core/all-versions/default/util/Android.bp index 7caf18ddfd..b96f2d2b87 100644 --- a/audio/core/all-versions/default/util/Android.bp +++ b/audio/core/all-versions/default/util/Android.bp @@ -112,6 +112,25 @@ cc_library { ], } +cc_library { + name: "android.hardware.audio@7.1-util", + defaults: ["android.hardware.audio-util_default"], + shared_libs: [ + "android.hardware.audio.common@7.0", + "android.hardware.audio.common@7.1-enums", + "android.hardware.audio.common@7.1-util", + "android.hardware.audio@7.1", + "libbase", + ], + cflags: [ + "-DMAJOR_VERSION=7", + "-DMINOR_VERSION=1", + "-DCOMMON_TYPES_MINOR_VERSION=0", + "-DCORE_TYPES_MINOR_VERSION=0", + "-include common/all-versions/VersionMacro.h", + ], +} + // Note: this isn't a VTS test, but rather a unit test // to verify correctness of conversion utilities. cc_test { @@ -145,3 +164,37 @@ cc_test { test_suites: ["device-tests"], } + +cc_test { + name: "android.hardware.audio@7.1-util_tests", + defaults: ["android.hardware.audio-util_default"], + + srcs: ["tests/coreutils_tests.cpp"], + + // Use static linking to allow running in presubmit on + // targets that don't have HAL V7.1. + static_libs: [ + "android.hardware.audio.common@7.0", + "android.hardware.audio.common@7.1-enums", + "android.hardware.audio.common@7.1-util", + "android.hardware.audio@7.1", + "android.hardware.audio@7.1-util", + ], + + shared_libs: [ + "libbase", + "libxml2", + ], + + cflags: [ + "-Werror", + "-Wall", + "-DMAJOR_VERSION=7", + "-DMINOR_VERSION=1", + "-DCOMMON_TYPES_MINOR_VERSION=0", + "-DCORE_TYPES_MINOR_VERSION=0", + "-include common/all-versions/VersionMacro.h", + ], + + test_suites: ["device-tests"], +} diff --git a/audio/core/all-versions/default/util/tests/coreutils_tests.cpp b/audio/core/all-versions/default/util/tests/coreutils_tests.cpp index 3976b088e4..0e15960792 100644 --- a/audio/core/all-versions/default/util/tests/coreutils_tests.cpp +++ b/audio/core/all-versions/default/util/tests/coreutils_tests.cpp @@ -22,18 +22,18 @@ #define LOG_TAG "CoreUtils_Test" #include -#include +#include PATH(APM_XSD_ENUMS_H_FILENAME) #include #include #include using namespace android; using namespace ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION; -using namespace ::android::hardware::audio::CPP_VERSION; +using namespace ::android::hardware::audio::CORE_TYPES_CPP_VERSION; using ::android::hardware::hidl_vec; -using ::android::hardware::audio::CPP_VERSION::implementation::CoreUtils; +using ::android::hardware::audio::CORE_TYPES_CPP_VERSION::implementation::CoreUtils; namespace xsd { -using namespace ::android::audio::policy::configuration::V7_0; +using namespace ::android::audio::policy::configuration::CPP_VERSION; } static constexpr audio_channel_mask_t kInvalidHalChannelMask = AUDIO_CHANNEL_INVALID; diff --git a/audio/core/all-versions/vts/functional/Android.bp b/audio/core/all-versions/vts/functional/Android.bp index d810c5567a..03708957e4 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -195,7 +195,7 @@ cc_test { "android.hardware.audio.common@7.0", "android.hardware.audio.common@7.0-enums", "android.hardware.audio.common@7.1-enums", - "android.hardware.audio.common@7.0-util", + "android.hardware.audio.common@7.1-util", ], cflags: [ "-DMAJOR_VERSION=7",