commit eeabafba1667681738e7e7ed8df581f3c37e50df
author Ken Chen <cken@google.com> Wed Sep 02 07:53:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 02 07:53:39 2020 +0000
tree c718641eee2b0d0ac8ed02db1d515c88c4770322
parent 1baf553524bbead198336810ae0342c00a2bfb1c
parent e8c86ea29035db145415f8fb4c59fd8285973e69

Merge "Weak symbol AIBinder_{setRequesting,getCalling}Sid"

libs/binder/ndk/include_platform/android/binder_ibinder_platform.h

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 d4feaba..5811760 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 @@
  *
  * \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 @@
  * \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