commit 00a2b1f4973885eb7c5d477103914c697c961b2d
author Steven Moreland <smoreland@google.com> Tue Mar 30 17:42:43 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 30 17:42:43 2021 +0000
tree 45035f0d9e56bb349663e063be31794e9d5d17de
parent f369d9acc545910b13c9e60d2a127f463ea0d167
parent a8ad32b70701202dc5f336f6dfcb06114727835d

Merge changes I896e0bc8,I27231c4f

* changes:
  libbinder_ndk: use __ANDROID_VENDOR__
  Partial: Reland "libbinder: remove __ANDROID_APEX__ stability diff"

libs/binder/ndk/include_platform/android/binder_stability.h

diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h
index f5e8bf6..ce7255e 100644
--- a/libs/binder/ndk/include_platform/android/binder_stability.h
+++ b/libs/binder/ndk/include_platform/android/binder_stability.h
@@ -30,7 +30,7 @@
     FLAG_PRIVATE_VENDOR = 0x10000000,
 };
 
-#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
+#if defined(__ANDROID_VENDOR__)
 
 enum {
     FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR,
@@ -45,7 +45,7 @@
     AIBinder_markVendorStability(binder);
 }
 
-#else  // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
+#else  // defined(__ANDROID_VENDOR__)
 
 enum {
     FLAG_PRIVATE_LOCAL = 0,
@@ -62,7 +62,7 @@
     AIBinder_markSystemStability(binder);
 }
 
-#endif  // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
+#endif  // defined(__ANDROID_VENDOR__)
 
 /**
  * This interface has system<->vendor stability