diff options
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_interface_utils.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h index acb6970c01..8296356d6b 100644 --- a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h @@ -298,8 +298,7 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, #endif // TODO(b/368559337): fix versioning on product partition -// TODO(b/370091328): APEX modules call this function even it is unavailable. -#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_PRODUCT__) && \ +#if !defined(__ANDROID_PRODUCT__) && \ (defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36) if API_LEVEL_AT_LEAST (36, 202504) { if (codeToFunction != nullptr) { @@ -310,8 +309,7 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, #else (void)codeToFunction; (void)functionCount; -#endif // !defined(__ANDROID_APEX__) && !defined(__ANDROID_PRODUCT__) && \ -// (defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36) +#endif // defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36 return clazz; } |