| commit | a43d5da187cd7f6cbe7ccc2a860db188c6f4bfaf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Mar 27 23:31:29 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 27 23:31:29 2024 +0000 |
| tree | 1234467335cbc6b88014fa11ca3bbab6ffffce26 | |
| parent | 195631aa81c5c897ffa2030eb91e33e2a0c4746c [diff] | |
| parent | d9cefa987391a1fb81f5dd63a2b45ba560016ea8 [diff] |
Merge "libbinder: Include stability.cpp in the Trusty NDK library" into main am: 4e1e221a63 am: d9cefa9873 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3009332 Change-Id: I98fd28d654af16c8de73547d8859fe6f103eb4e2 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 += \