| commit | d9cefa987391a1fb81f5dd63a2b45ba560016ea8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Mar 27 23:14:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 27 23:14:12 2024 +0000 |
| tree | 21c84728333c658d0295eb91c6e36fe36374def1 | |
| parent | d69e76ad0582230e17b71aacb1f0e710c075ceb1 [diff] | |
| parent | 4e1e221a63069c179ae47a9f9183b4b49823bb7f [diff] |
Merge "libbinder: Include stability.cpp in the Trusty NDK library" into main am: 4e1e221a63 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3009332 Change-Id: I633f139929d222aa52f520b436d2712b734e216a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/ndk/stability.cpp b/libs/binder/ndk/stability.cpp index ca3d5e6..39cf1c4 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 03fd006..7a275c2 100644 --- a/libs/binder/trusty/ndk/rules.mk +++ b/libs/binder/trusty/ndk/rules.mk
@@ -23,6 +23,7 @@ $(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 += \