diff options
-rw-r--r-- | libs/binder/ndk/stability.cpp | 2 | ||||
-rw-r--r-- | libs/binder/trusty/ndk/rules.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/ndk/stability.cpp b/libs/binder/ndk/stability.cpp index ca3d5e6cf3..39cf1c4124 100644 --- a/libs/binder/ndk/stability.cpp +++ b/libs/binder/ndk/stability.cpp @@ -23,7 +23,7 @@ using ::android::internal::Stability; -#ifdef __ANDROID_VNDK__ +#if defined(__ANDROID_VNDK__) && !defined(__TRUSTY__) #error libbinder_ndk should only be built in a system context #endif diff --git a/libs/binder/trusty/ndk/rules.mk b/libs/binder/trusty/ndk/rules.mk index 03fd006fd2..7a275c2696 100644 --- a/libs/binder/trusty/ndk/rules.mk +++ b/libs/binder/trusty/ndk/rules.mk @@ -23,6 +23,7 @@ MODULE_SRCS := \ $(LIBBINDER_NDK_DIR)/ibinder.cpp \ $(LIBBINDER_NDK_DIR)/libbinder.cpp \ $(LIBBINDER_NDK_DIR)/parcel.cpp \ + $(LIBBINDER_NDK_DIR)/stability.cpp \ $(LIBBINDER_NDK_DIR)/status.cpp \ MODULE_EXPORT_INCLUDES += \ |