diff options
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 1 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -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 |
5 files changed, 10 insertions, 5 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 67f12e8efe..584d7c50db 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -960,6 +960,7 @@ static void DumpDynamicPartitionInfo() { } RunCommand("LPDUMP", {"lpdump", "--all"}); + RunCommand("DEVICE-MAPPER", {"gsid", "dump-device-mapper"}); } static void AddAnrTraceDir(const bool add_to_zip, const std::string& anr_traces_dir) { diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 2a140f4507..7ee4882b6a 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -73,6 +73,7 @@ cc_library { // or dessert updates. Instead, apex users should use libbinder_ndk. apex_available: [ "//apex_available:platform", + "com.android.vndk.current", // TODO(b/139016109) remove these three "com.android.media.swcodec", "test_com.android.media.swcodec", 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 |