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
This commit is contained in:
Jooyung Han
2024-02-01 12:49:35 +09:00
parent c5c6c62995
commit 23e5bf2873
2 changed files with 2 additions and 2 deletions

View File

@@ -93,7 +93,7 @@ std::vector<std::reference_wrapper<const tinyxml2::XMLElement>> 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));

View File

@@ -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));