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

Commit 0c76fe1e 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 am: e8046754 

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



Change-Id: Ie00398fb42938411ba7ee0c59a4cd8a12455f3d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6d2c7eb e8046754

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;

}