diff options
| author | 2019-10-17 05:19:20 -0700 | |
|---|---|---|
| committer | 2019-10-17 05:19:20 -0700 | |
| commit | c448040b2a1afb88e7c40776028ba6a077224fc7 (patch) | |
| tree | 8f56bd76e7db88104b29988d38cef2c4c87dc020 | |
| parent | 01c0c3141852ea5708ea30c79d99f17a23014b17 (diff) | |
| parent | e75a2b370c8d2f90fa432146c88db6e526853b84 (diff) | |
Merge changes from topic "add-vndk-apex" am: a1ebc66b6f
am: e75a2b370c
Change-Id: I4ac8aab10321e26e558d71e61376aa712f177c95
| -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, 5 insertions, 8 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 9b47f80f1d..63456404c0 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -505,7 +505,7 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { } } -#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) +#if 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 b2f51d381c..2894482f55 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_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) +#if 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 2a4ded8691..e1a8cfd1f0 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -30,8 +30,7 @@ enum { FLAG_PRIVATE_VENDOR = 0x10000000, }; -#if defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || \ - (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) +#if (defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)) enum { FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR, @@ -46,8 +45,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markVendorStability(binder); } -#else // defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && - // !defined(__ANDROID_APEX__)) +#else // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) enum { FLAG_PRIVATE_LOCAL = 0, @@ -62,8 +60,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markSystemStability(binder); } -#endif // defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) || (defined(__ANDROID_VNDK__) && - // !defined(__ANDROID_APEX__)) +#endif // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) /** * This interface has system<->vendor stability |