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

Commit 23e5bf28 authored Feb 01, 2024 by Jooyung Han

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

parent c5c6c629

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