summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ken Chen <cken@google.com> 2020-09-02 08:47:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-09-02 08:47:37 +0000
commit025e8f1ef9fbfa82f628759234ef2c56f3968af6 (patch)
tree9777e8c49395efc8c070c61b3d88a08012f837b4
parent4329742ab51b94d198ec26ff974d456e47fa1bd5 (diff)
parenteeabafba1667681738e7e7ed8df581f3c37e50df (diff)
Merge "Weak symbol AIBinder_{setRequesting,getCalling}Sid" am: eeabafba16
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1398747 Change-Id: Ib7a4057b3df9eb17824aca2cc8acdf7ecde67108
-rw-r--r--libs/binder/ndk/include_platform/android/binder_ibinder_platform.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h b/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h
index d4feabac8a..5811760d3a 100644
--- a/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h
+++ b/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h
@@ -32,7 +32,8 @@ __BEGIN_DECLS
*
* \param binder local server binder to request security contexts on
*/
-void AIBinder_setRequestingSid(AIBinder* binder, bool requestingSid) __INTRODUCED_IN(31);
+__attribute__((weak)) void AIBinder_setRequestingSid(AIBinder* binder, bool requestingSid)
+ __INTRODUCED_IN(31);
/**
* Returns the selinux context of the callee.
@@ -45,7 +46,7 @@ void AIBinder_setRequestingSid(AIBinder* binder, bool requestingSid) __INTRODUCE
* \return security context or null if unavailable. The lifetime of this context
* is the lifetime of the transaction.
*/
-__attribute__((warn_unused_result)) const char* AIBinder_getCallingSid() __INTRODUCED_IN(31);
+__attribute__((weak, warn_unused_result)) const char* AIBinder_getCallingSid() __INTRODUCED_IN(31);
__END_DECLS