Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0c8182e authored Jan 04, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jan 04, 2024

Merge "libbinder: Fix Trusty build from __ANDROID_VENDOR__" into main am:...

Merge "libbinder: Fix Trusty build from __ANDROID_VENDOR__" into main am: 28d780a2 am: d9a928a0 am: 3d0482bb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2889549

Change-Id: Idf03722823fcedea473e24462adf728461d0d586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 33c409d9 3d0482bb

libs/binder/ndk/stability.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ using ::android::internal::Stability;
		#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

libs/binder/trusty/rust/rules.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,9 @@ MODULE_LIBRARY_DEPS += \
		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 += \