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

Commit bad4c6e2 authored by Pawan Wagh's avatar Pawan Wagh Committed by Gerrit Code Review
Browse files

Merge "Exclude setting code maps from APEX" into main

parents 6f017d59 3ea49b86

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

+4 −2
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, 
#endif



// TODO(b/368559337): fix versioning on product partition

#if !defined(__ANDROID_PRODUCT__) && \

// TODO(b/370091328): APEX modules call this function even it is unavailable.

#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_PRODUCT__) && \

        (defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36)

    if API_LEVEL_AT_LEAST (36, 202504) {

        if (codeToFunction != nullptr) {
@@ -309,7 +310,8 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, 
#else

    (void)codeToFunction;

    (void)functionCount;

#endif  // defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36

#endif  // !defined(__ANDROID_APEX__) && !defined(__ANDROID_PRODUCT__) && \

//     (defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36)

    return clazz;

}