| commit | e4674b4d8a5632eaeda79f22d2c1d20335362669 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Jun 02 23:48:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 02 23:48:28 2022 +0000 |
| tree | 7a6eb372214a00e5c64f5c3f4af6b1b7ede8d453 | |
| parent | d78b0abd1de1ba3fcb0602aa56ad431cd5f113e2 [diff] | |
| parent | a56ffcdeef67ca5ac0f7f5cf03231a1db5561f15 [diff] |
Merge "libbinder_ndk: no min sdk version - avoid weak" am: 503648f706 am: a56ffcdeef Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2115355 Change-Id: I59d6d6ffa9215d47b865cfcef7a9bed8a7eb36bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index d0cd11f..683a433 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h
@@ -98,9 +98,9 @@ * This interface has system<->vendor stability */ // b/227835797 - can't use __INTRODUCED_IN(30) because old targets load this code -#if __ANDROID_MIN_SDK_VERSION__ < 30 +#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 30 __attribute__((weak)) -#endif // __ANDROID_MIN_SDK_VERSION__ < 30 +#endif // defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 30 void AIBinder_markVintfStability(AIBinder* binder); __END_DECLS