diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-27 22:58:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 22:58:58 +0000 |
| commit | 4e1e221a63069c179ae47a9f9183b4b49823bb7f (patch) | |
| tree | 21c84728333c658d0295eb91c6e36fe36374def1 | |
| parent | dc829d6a92b95a5fef9ad2606e4d0fb7eca69e47 (diff) | |
| parent | e7f5f2f594fecd628f9f61c97d9abfcf92eb1423 (diff) | |
| download | native-4e1e221a63069c179ae47a9f9183b4b49823bb7f.tar.gz | |
Merge "libbinder: Include stability.cpp in the Trusty NDK library" into main
| -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 += \ |