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

Commit e8046754 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Exclude setting code maps from APEX" into main am: bad4c6e2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3287935



Change-Id: I75c0b93ca85f149c5c784cf22e8c75980b96dde2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54d92a4f bad4c6e2

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;

}