summaryrefslogtreecommitdiff
path: root/libs/binder/Parcel.cpp
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2019-10-18 16:30:14 +0900
committer Jooyung Han <jooyung@google.com> 2019-10-19 02:29:44 +0900
commit4df8e2d940dfc20ab83149c4f8575e138203d937 (patch)
treea194a90f79d0f0fb951d46967c9033957e552608 /libs/binder/Parcel.cpp
parent2c90aa309d4ae007005552463cbbca2d864d2d73 (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
Diffstat (limited to 'libs/binder/Parcel.cpp')
-rw-r--r--libs/binder/Parcel.cpp2
1 files changed, 1 insertions, 1 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');