commit 498ccce6c1b23aac11abf36f17f3e3cdd7f54aeb
author Pawan Wagh <waghpawan@google.com> Wed Oct 02 20:36:54 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 02 20:36:54 2024 +0000
tree 828a7da89e9d35b22e70c3d78a72787ca20fcb38
parent 3ea49b86f07d8b31cefb50bb61f5b42506cf9c0d

Revert "Exclude setting code maps from APEX"

This reverts commit 3ea49b86f07d8b31cefb50bb61f5b42506cf9c0d.

Reason for revert: Fixing b/370091328 separately

Change-Id: I71375d19363a95fc646e0c68e352376fe28f33a3

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

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 acb6970..8296356 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 @@
 #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 @@
 #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;
 }