Merge "Clean up a workaround for product variants" into main (54392a54) · Commits · e / os / android_frameworks_native

libs/binder/ndk/include_cpp/android/binder_interface_utils.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@
		#include <android/binder_auto_utils.h>
		#include <android/binder_ibinder.h>

		#if defined(__ANDROID_VENDOR__)
		#if defined(__ANDROID_VENDOR_API__)
		#include <android/llndk-versioning.h>
		#elif !defined(API_LEVEL_AT_LEAST)
		#if defined(__BIONIC__)
		@@ -39,7 +39,7 @@
		#else
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) (true)
		#endif // __BIONIC__
		#endif // __ANDROID_VENDOR__
		#endif // __ANDROID_VENDOR_API__

		#if __has_include(<android/binder_shell.h>)
		#include <android/binder_shell.h>
		@@ -297,9 +297,7 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,
		}
		#endif

		// TODO(b/368559337): fix versioning on product partition
		#if !defined(__ANDROID_PRODUCT__) && \
		(defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) \|\| __ANDROID_API__ >= 36)
		#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) \|\| __ANDROID_API__ >= 36
		if API_LEVEL_AT_LEAST (36, 202504) {
		if (codeToFunction != nullptr) {
		AIBinder_Class_setTransactionCodeToFunctionNameMap(clazz, codeToFunction,

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@
		#include <set>
		#include <sstream>

		// Include llndk-versioning.h only for vendor build as it is not available for NDK headers.
		#if defined(__ANDROID_VENDOR__)
		// Include llndk-versioning.h only for non-system build as it is not available for NDK headers.
		#if defined(__ANDROID_VENDOR_API__)
		#include <android/llndk-versioning.h>
		#elif !defined(API_LEVEL_AT_LEAST)
		#if defined(__BIONIC__)
		@@ -32,7 +32,7 @@
		#else
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) (true)
		#endif // __BIONIC__
		#endif // __ANDROID_VENDOR__
		#endif // __ANDROID_VENDOR_API__

		namespace aidl::android::os {