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

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

Merge "Revert "Exclude setting code maps from APEX"" into main am: 51b2f8f1 am: b588582a 

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



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

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

+2 −4
Original line number Diff line number Diff line
@@ -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;

}