Reland "libbinder: remove __ANDROID_APEX__ stability diff"
Since the product partition is using __ANDROID_VNDK__, we can't remove
the __ANDROID_APEX__ check from the NDK header.
This reverts commit 15b7029849a1c59ecb54961fa7417ee0611408a0.
Reason for revert: reland b/179906909
Fixes: 179906909
Test: the following, which was failing before w/ stability error
mmma packages/modules/Gki
adb install --staged-ready-timeout 600000\
out/host/linux-x86/testcases/GkiInstallTest/com.android.gki.kmi_5_10_android12_0_test_high.apex
Change-Id: I189b5c07ffd767fa46c59fd8828ba4f59b31f095
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 1a4ede1..3773760 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -520,7 +520,7 @@
}
}
-#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
+#if defined(__ANDROID_VNDK__)
constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');
#else
constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');