diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2022-01-26 18:57:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-26 18:57:31 +0000 |
| commit | 9b5dcd32aa701057e28c405e87f8c13bc77145dd (patch) | |
| tree | 61be897f9dbe3a3aa904b21ab0a52d638e406e25 /audio/common/all-versions/default/VersionUtils.h | |
| parent | 425df50402834f8b634ce33feee783dfb3df3907 (diff) | |
| parent | 40fde0bc07be50644705a708a522c941840f35c7 (diff) | |
Merge changes from topic "b-214426419-hal-v7_1"
* changes:
Audio HAL V7.1: Update VTS
Audio HAL V7.1: Update the default implementation
Audio HAL V7.1: Interfaces & types
Diffstat (limited to 'audio/common/all-versions/default/VersionUtils.h')
| -rw-r--r-- | audio/common/all-versions/default/VersionUtils.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/audio/common/all-versions/default/VersionUtils.h b/audio/common/all-versions/default/VersionUtils.h index 9bfca0cdcc..9771374c33 100644 --- a/audio/common/all-versions/default/VersionUtils.h +++ b/audio/common/all-versions/default/VersionUtils.h @@ -17,7 +17,30 @@ #ifndef ANDROID_HARDWARE_AUDIO_EFFECT_VERSION_UTILS_H #define ANDROID_HARDWARE_AUDIO_EFFECT_VERSION_UTILS_H -#include PATH(android/hardware/audio/common/FILE_VERSION/types.h) +// A workaround for b/216149583 (vendor code having its own copy of VersionMacro.h) +#ifndef COMMON_TYPES_MINOR_VERSION +#define COMMON_TYPES_MINOR_VERSION MINOR_VERSION +#endif +#ifndef CORE_TYPES_MINOR_VERSION +#define CORE_TYPES_MINOR_VERSION MINOR_VERSION +#endif +#ifndef COMMON_TYPES_FILE_VERSION +#define COMMON_TYPES_FILE_VERSION EXPAND_CONCAT_3(MAJOR_VERSION, ., COMMON_TYPES_MINOR_VERSION) +#endif +#ifndef CORE_TYPES_FILE_VERSION +#define CORE_TYPES_FILE_VERSION EXPAND_CONCAT_3(MAJOR_VERSION, ., CORE_TYPES_MINOR_VERSION) +#endif +#ifndef COMMON_TYPES_CPP_VERSION +#define COMMON_TYPES_CPP_VERSION EXPAND_CONCAT_4(V, MAJOR_VERSION, _, COMMON_TYPES_MINOR_VERSION) +#endif +#ifndef CORE_TYPES_CPP_VERSION +#define CORE_TYPES_CPP_VERSION EXPAND_CONCAT_4(V, MAJOR_VERSION, _, CORE_TYPES_MINOR_VERSION) +#endif +// End of workaround + +// clang-format off +#include PATH(android/hardware/audio/common/COMMON_TYPES_FILE_VERSION/types.h) +// clang-format on namespace android { namespace hardware { |