commit 5f1ddcdd264f5bf0f34ec926c3fb13ec0bd9be8f
author Andrei Homescu <ahomescu@google.com> Fri Dec 22 00:21:43 2023 +0000
committer Andrei Homescu <ahomescu@google.com> Fri Dec 22 00:37:26 2023 +0000
tree e9b90e5c7cbe8f757ec6ac7ad78d822579660479
parent 81c83d590884dd4da62d18d323d9d8e64f4c5e9e

libbinder: Fix Trusty build from __ANDROID_VENDOR__

Fix a couple of minor issues from the addition of
__ANDROID_VENDOR__ to the Trusty build.

Bug: 242243245
Test: Build Rust binderRpcTest on Trusty
Change-Id: I834dd195149a42da39438af4d02a05190025497d

libs/binder/ndk/stability.cpp

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