diff options
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_parcel_platform.h | 8 | ||||
| -rw-r--r-- | libs/binder/ndk/libbinder_ndk.map.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_parcel_platform.h b/libs/binder/ndk/include_platform/android/binder_parcel_platform.h index d54c1a18ba..6372449716 100644 --- a/libs/binder/ndk/include_platform/android/binder_parcel_platform.h +++ b/libs/binder/ndk/include_platform/android/binder_parcel_platform.h @@ -20,9 +20,7 @@ __BEGIN_DECLS -#if defined(__ANDROID_APEX__) || defined(__ANDROID_VNDK__) -#error this is only for platform code -#endif +#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__) /** * Gets whether or not FDs are allowed by this AParcel @@ -33,6 +31,9 @@ __BEGIN_DECLS */ bool AParcel_getAllowFds(const AParcel*); +#endif + +#if !defined(__ANDROID_APEX__) /** * Data written to the parcel will be zero'd before being deleted or realloced. * @@ -43,5 +44,6 @@ bool AParcel_getAllowFds(const AParcel*); * \param parcel The parcel to clear associated data from. */ void AParcel_markSensitive(const AParcel* parcel); +#endif __END_DECLS diff --git a/libs/binder/ndk/libbinder_ndk.map.txt b/libs/binder/ndk/libbinder_ndk.map.txt index 8d08275eec..f1db653e07 100644 --- a/libs/binder/ndk/libbinder_ndk.map.txt +++ b/libs/binder/ndk/libbinder_ndk.map.txt @@ -117,6 +117,7 @@ LIBBINDER_NDK31 { # introduced=31 ABinderProcess_setupPolling; # apex AIBinder_getCallingSid; # apex AIBinder_setRequestingSid; # apex + AParcel_markSensitive; # llndk AServiceManager_isDeclared; # apex llndk AServiceManager_forEachDeclaredInstance; # apex llndk AServiceManager_registerLazyService; # llndk @@ -139,7 +140,6 @@ LIBBINDER_NDK31 { # introduced=31 LIBBINDER_NDK_PLATFORM { global: AParcel_getAllowFds; - AParcel_markSensitive; extern "C++" { AIBinder_fromPlatformBinder*; AIBinder_toPlatformBinder*; |