| commit | 3d0482bbc044a0b4af1b2de1da00f061fbb61d68 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jan 04 00:56:38 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 04 00:56:38 2024 +0000 |
| tree | 3970a4bb6b0404704cba76c74414a2ac045baf25 | |
| parent | b2a5242834e37356906db9239c8e9da2712e5138 [diff] | |
| parent | d9a928a085328c6ae82852c464c4bd03623f9a10 [diff] |
Merge "libbinder: Fix Trusty build from __ANDROID_VENDOR__" into main am: 28d780a2f9 am: d9a928a085 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2889549 Change-Id: Ia5d54579b9819ab46b1c36d9da68ecfb98f3fe42 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 73eb863..ca3d5e6 100644 --- a/libs/binder/ndk/stability.cpp +++ b/libs/binder/ndk/stability.cpp
@@ -27,7 +27,7 @@ #error libbinder_ndk should only be built in a system context #endif -#ifdef __ANDROID_VENDOR__ +#if defined(__ANDROID_VENDOR__) && !defined(__TRUSTY__) #error libbinder_ndk should only be built in a system context #endif
diff --git a/libs/binder/trusty/rust/rules.mk b/libs/binder/trusty/rust/rules.mk index 6de7eb5..d343f14 100644 --- a/libs/binder/trusty/rust/rules.mk +++ b/libs/binder/trusty/rust/rules.mk
@@ -30,6 +30,9 @@ external/rust/crates/downcast-rs \ trusty/user/base/lib/trusty-sys \ +MODULE_RUSTFLAGS += \ + --cfg 'android_vendor' \ + # Trusty does not have `ProcessState`, so there are a few # doc links in `IBinder` that are still broken. MODULE_RUSTFLAGS += \