commit 3a7359df1b3b8e56f8e21bb5bc18dbf4a67c24e7
author Steven Moreland <smoreland@google.com> Fri Aug 09 02:33:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 09 02:33:04 2019 -0700
tree a8dcbeb1803c35c422a34b7435faf42104610f7d
parent 22bda9c24b2d1fcb7c9305b337e6ed7222ef5cf3
parent effc39f52be5d13667f5c15316348e1ea0fe3242

Merge "libbinder_ndk: __ANDROID_NDK__ canary" am: 1bc89a26ce am: ee4bf4c966 am: 13fdc3d6e6
am: effc39f52b

Change-Id: Ifa6027a8b920ddbb140efd93dc958622fddfb76a

libs/binder/ndk/stability.cpp

diff --git a/libs/binder/ndk/stability.cpp b/libs/binder/ndk/stability.cpp
index abafe1f..a5b3ece 100644
--- a/libs/binder/ndk/stability.cpp
+++ b/libs/binder/ndk/stability.cpp
@@ -27,6 +27,10 @@
 #error libbinder_ndk should only be built in a system context
 #endif
 
+#ifdef __ANDROID_NDK__
+#error libbinder_ndk should only be built in a system context
+#endif
+
 // explicit extern because symbol is only declared in header when __ANDROID_VNDK__
 extern "C" void AIBinder_markVendorStability(AIBinder* binder) {
     Stability::markVndk(binder->getBinder().get());