| commit | 921a39fececc48e6b91b5afe498223c02553e25f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Nov 14 08:05:31 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 14 08:05:31 2019 -0800 |
| tree | 45d71197fa9d6c014336acc3d739ddb47c4e012b | |
| parent | cdb8facd6cc7b8edae4b47d55e96504cf155cde0 [diff] | |
| parent | 0d83872951243cc6f3dcd3c65f33b23a1f2c8374 [diff] |
Merge "libbinder_ndk: R system users can run on Q devices" am: 0d83872951 Change-Id: I06af432aa4e36e3fd0c6d458c2189d351c194cf3
diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index 2a4ded8..56d95a7 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 @@ /** * 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); }