diff options
| author | Andrei Homescu <ahomescu@google.com> | 2024-03-22 22:39:54 +0000 |
|---|---|---|
| committer | Andrei Homescu <ahomescu@google.com> | 2024-03-22 22:47:04 +0000 |
| commit | e7f5f2f594fecd628f9f61c97d9abfcf92eb1423 (patch) | |
| tree | 7ec0d7563958a067de9f950c1d2100c4643409ae | |
| parent | 6b97f7fce858cec5e7a343fc6e20e2a4f747602b (diff) | |
| download | native-e7f5f2f594fecd628f9f61c97d9abfcf92eb1423.tar.gz | |
libbinder: Include stability.cpp in the Trusty NDK library
Bug: 242243245
Test: build Trusty
Change-Id: I3d449982cb3b6e5e8b40f58f1924726400a22cf0
| -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 += \ |