Merge "Use LLNDK guard instead of builtin_available" into main am: 63b64e2995 am: 3f23aa7523

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2943125

Change-Id: I2ff3338a90b83fa4912aac65ca1368b0d458663e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2024-02-02 02:39:36 +00:00
committed by Automerger Merge Worker
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));