diff options
| author | 2019-10-18 16:30:14 +0900 | |
|---|---|---|
| committer | 2019-10-19 02:29:44 +0900 | |
| commit | 4df8e2d940dfc20ab83149c4f8575e138203d937 (patch) | |
| tree | a194a90f79d0f0fb951d46967c9033957e552608 | |
| parent | 2c90aa309d4ae007005552463cbbca2d864d2d73 (diff) | |
Revert "Revert "libbinder: Consider VNDK_APEX as vendor stable""
This reverts commit e896c8e4053dbab5461b8dbd32c447572e504dd5.
Bug: 142582178
Test: device with current vndk boots successfully
Change-Id: I4f33955d7a361efd92e2ec68e5e21340809450a8
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/include/binder/Stability.h | 2 | ||||
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_stability.h | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 63456404c0..9b47f80f1d 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -505,7 +505,7 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { } } -#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R'); #else constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T'); diff --git a/libs/binder/include/binder/Stability.h b/libs/binder/include/binder/Stability.h index 2894482f55..b2f51d381c 100644 --- a/libs/binder/include/binder/Stability.h +++ b/libs/binder/include/binder/Stability.h @@ -81,7 +81,7 @@ private: VINTF = 0b111111, }; -#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) static constexpr Level kLocalStability = Level::VENDOR; #else static constexpr Level kLocalStability = Level::SYSTEM; diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index e1a8cfd1f0..2a4ded8691 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -30,7 +30,8 @@ enum { FLAG_PRIVATE_VENDOR = 0x10000000, }; -#if (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) +#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || \ + (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) enum { FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR, @@ -45,7 +46,8 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markVendorStability(binder); } -#else // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#else // defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && + // !defined(__ANDROID_APEX__)) enum { FLAG_PRIVATE_LOCAL = 0, @@ -60,7 +62,8 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markSystemStability(binder); } -#endif // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) +#endif // defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && + // !defined(__ANDROID_APEX__)) /** * This interface has system<->vendor stability |