Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63b64e29 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Use LLNDK guard instead of builtin_available" into main

parents 7f3b4b2a 23e5bf28

audio/aidl/default/EffectConfig.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

audio/aidl/default/EffectMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));