Skip to content

Commit 498ccce

Browse files
waghpawanGerrit Code Review
authored andcommitted
Revert "Exclude setting code maps from APEX"
This reverts commit 3ea49b8. Reason for revert: Fixing b/370091328 separately Change-Id: I71375d19363a95fc646e0c68e352376fe28f33a3
1 parent 3ea49b8 commit 498ccce

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,
298298
#endif
299299

300300
// TODO(b/368559337): fix versioning on product partition
301-
// TODO(b/370091328): APEX modules call this function even it is unavailable.
302-
#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_PRODUCT__) && \
301+
#if !defined(__ANDROID_PRODUCT__) && \
303302
(defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36)
304303
if API_LEVEL_AT_LEAST (36, 202504) {
305304
if (codeToFunction != nullptr) {
@@ -310,8 +309,7 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,
310309
#else
311310
(void)codeToFunction;
312311
(void)functionCount;
313-
#endif // !defined(__ANDROID_APEX__) && !defined(__ANDROID_PRODUCT__) && \
314-
// (defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36)
312+
#endif // defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36
315313
return clazz;
316314
}
317315

0 commit comments

Comments
 (0)