diff options
| author | 2021-03-30 19:33:33 +0000 | |
|---|---|---|
| committer | 2021-03-30 19:33:33 +0000 | |
| commit | dadfbdf719f6a6e28aad1bebf0b6b2aa5392f5da (patch) | |
| tree | 404331dd4905cf897732e5b110655786b2640dd7 | |
| parent | caf62faed339c3b1fd439609348a7617550f2c46 (diff) | |
| parent | fc726abd117543d2d1020771d8839e1c17f4fba1 (diff) | |
Merge changes I896e0bc8,I27231c4f am: 00a2b1f497 am: 93169e309f am: fc726abd11
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1653861
Change-Id: Ie13c72ea8c23779a0348c071be8c509e0379ed32
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_stability.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index 44ed48f839..ce7255e174 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -30,9 +30,7 @@ enum { FLAG_PRIVATE_VENDOR = 0x10000000, }; -// TODO(b/180646847): __ANDROID_APEX__ here is what allows product partition to -// talk to system. -#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#if defined(__ANDROID_VENDOR__) enum { FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR, @@ -47,7 +45,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markVendorStability(binder); } -#else // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#else // defined(__ANDROID_VENDOR__) enum { FLAG_PRIVATE_LOCAL = 0, @@ -64,7 +62,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markSystemStability(binder); } -#endif // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#endif // defined(__ANDROID_VENDOR__) /** * This interface has system<->vendor stability |