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

Commit 28d780a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 5bf55726 5f1ddcdd

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 += \