commit 95e58ab2b75a90a5382cd84c1d73aec0337209f1
author Steven Moreland <smoreland@google.com> Fri Aug 09 02:42:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 09 02:42:44 2019 -0700
tree 53609a1734786dd814cf4ccc583e68432bade8ee
parent d2984d0426f99ffbc492c664c44679939661e7d9
parent 3a7359df1b3b8e56f8e21bb5bc18dbf4a67c24e7

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

Change-Id: I9c7b5b4781e90cadd8664c17cc4f0429bf51edd1

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());