diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-14 21:50:47 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-14 21:50:47 +0000 |
| commit | 6b1f732ace86b8d89ec52db52b3d22d44b0bb897 (patch) | |
| tree | 127bfb55426bff770700db9f3c9de88afa09c31d | |
| parent | 285a2b53b053c0037714fc51df0325206a8da1dc (diff) | |
| parent | 8d6ce358989dd2ca7347157c6ed160960f22c331 (diff) | |
| download | native-android10-mainline-resolv-release.tar.gz | |
Merge cherrypicks of [9734155] into qt-aml-resolv-releaseandroid-mainline-10.0.0_r8android10-mainline-resolv-release
Change-Id: If526df5e745f0b0f6f3975355ac7cb3876af9271
| -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); } |