From 23e5bf28733e562c2adf6551d6c1eac91a3d734b Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 1 Feb 2024 12:49:35 +0900 Subject: [PATCH] Use LLNDK guard instead of builtin_available APEXSUPPORT_API was a workaround when we had no support for __ANDROID_VENDOR_API__. Since we have it now, use it instead of builtin_available(android APEXSUPPORT_API). Bug: 302088370 Test: CtsMediaAudioTestCases Change-Id: I28b0e0ebab5f357a2f5cc29f244ae5494e379fbe --- audio/aidl/default/EffectConfig.cpp | 2 +- audio/aidl/default/EffectMain.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/aidl/default/EffectConfig.cpp b/audio/aidl/default/EffectConfig.cpp index 1cc48978d3..a1fbefa8b9 100644 --- a/audio/aidl/default/EffectConfig.cpp +++ b/audio/aidl/default/EffectConfig.cpp @@ -93,7 +93,7 @@ std::vector> EffectConfig::ge } bool EffectConfig::resolveLibrary(const std::string& path, std::string* resolvedPath) { - if (__builtin_available(android AAPEXSUPPORT_API, *)) { + if constexpr (__ANDROID_VENDOR_API__ >= 202404) { AApexInfo *apexInfo; if (AApexInfo_create(&apexInfo) == AAPEXINFO_OK) { std::string apexName(AApexInfo_getName(apexInfo)); diff --git a/audio/aidl/default/EffectMain.cpp b/audio/aidl/default/EffectMain.cpp index ac178b6a06..a300cfdd78 100644 --- a/audio/aidl/default/EffectMain.cpp +++ b/audio/aidl/default/EffectMain.cpp @@ -29,7 +29,7 @@ static const char* kDefaultConfigName = "audio_effects_config.xml"; static inline std::string config_file_path() { - if (__builtin_available(android AAPEXSUPPORT_API, *)) { + if constexpr (__ANDROID_VENDOR_API__ >= 202404) { AApexInfo *apexInfo; if (AApexInfo_create(&apexInfo) == AAPEXINFO_OK) { std::string apexName(AApexInfo_getName(apexInfo));