diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-14 19:06:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-14 19:06:42 +0000 |
| commit | ec0c7f841ef05e07eec3e57a40dc0277b4701ebd (patch) | |
| tree | 127bfb55426bff770700db9f3c9de88afa09c31d | |
| parent | 4417ee0aa329fbbbf02c2b5abe7702bf5e62a806 (diff) | |
| parent | d7d35ad924aaa391ce58d922b92889545df159d6 (diff) | |
| download | native-android10-mainline-networking-release.tar.gz | |
Merge cherrypicks of [9732513] into qt-aml-networking-releaseandroid-mainline-10.0.0_r6android10-mainline-networking-release
Change-Id: Iac8b654754b430784d4f8f4e983d3daefe65c20a
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_stability.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index 2a4ded8691..56d95a7759 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -56,9 +56,11 @@ enum { /** * This interface has the stability of the system image. */ -void AIBinder_markSystemStability(AIBinder* binder); +__attribute__((weak)) void AIBinder_markSystemStability(AIBinder* binder); static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { + if (AIBinder_markSystemStability == nullptr) return; + AIBinder_markSystemStability(binder); } |