diff options
| author | 2019-09-30 12:46:53 -0700 | |
|---|---|---|
| committer | 2019-09-30 12:46:53 -0700 | |
| commit | c1548fb9502fde74227f6e1a9791716502cf856c (patch) | |
| tree | a2408f9285f56c0087daf86a0e7459b232fe53a9 /libs | |
| parent | 5cb69cbbc973a078bd36641712a242f40b6cb1d6 (diff) | |
| parent | e8ebd7d62b593c705c8676a3586f0bce93d19ee0 (diff) | |
Merge "libbinder: Consider 'VNDK + APEX' as system stable" am: 7f10d41dc3 am: eb9c8baef8
am: e8ebd7d62b
Change-Id: I0f09b9702ad396de6d3d795c979d56bc4b1e6082
Diffstat (limited to 'libs')
| -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 | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 93e6c5fb2c..e5c7d74e23 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -509,7 +509,7 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { } } -#ifdef __ANDROID_VNDK__ +#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 b84657ac56..2894482f55 100644 --- a/libs/binder/include/binder/Stability.h +++ b/libs/binder/include/binder/Stability.h @@ -81,7 +81,7 @@ private: VINTF = 0b111111, }; -#ifdef __ANDROID_VNDK__ +#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 e6aeb04e6f..b03fce1e39 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -20,7 +20,7 @@ __BEGIN_DECLS -#ifdef __ANDROID_VNDK__ +#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) /** * This interface has the stability of the vendor image. @@ -31,7 +31,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markVendorStability(binder); } -#else // ndef defined __ANDROID_VNDK__ +#else // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) /** * This interface has the stability of the system image. @@ -42,7 +42,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) { AIBinder_markSystemStability(binder); } -#endif // ifdef __ANDROID_VNDK__ +#endif // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__) /** * This interface has system<->vendor stability |