commit cf0037d817cac194007461e60a744186e3f672b8
author Matthew Maurer <mmaurer@google.com> Wed Oct 09 21:38:29 2024 +0000
committer Matthew Maurer <mmaurer@google.com> Thu Oct 24 23:44:12 2024 +0000
tree fc7e2836730f6626fac5452c3eeb5cd2a1b60736
parent 86e7e6be0ec898779c738f4507ad1e25c7e82eeb

rust: Make binder-ndk-sys crate buildable via Cargo for NDK

Test: cargo build --target=aarch64-linux-android
Bug: 368303574
Change-Id: I58e41d34bc16d28bb899dc8a58dce12627f7ab4e

libs/binder/rust/sys/BinderBindings.hpp

diff --git a/libs/binder/rust/sys/BinderBindings.hpp b/libs/binder/rust/sys/BinderBindings.hpp
index bd666fe..557f0e8 100644
--- a/libs/binder/rust/sys/BinderBindings.hpp
+++ b/libs/binder/rust/sys/BinderBindings.hpp
@@ -15,15 +15,19 @@
  */
 
 #include <android/binder_ibinder.h>
+#include <android/binder_parcel.h>
+#include <android/binder_status.h>
+
+/* Platform only */
+#if defined(ANDROID_PLATFORM) || defined(__ANDROID_VENDOR__)
 #include <android/binder_ibinder_platform.h>
 #include <android/binder_manager.h>
-#include <android/binder_parcel.h>
 #include <android/binder_parcel_platform.h>
 #include <android/binder_process.h>
 #include <android/binder_rpc.h>
 #include <android/binder_shell.h>
 #include <android/binder_stability.h>
-#include <android/binder_status.h>
+#endif
 
 namespace android {
 
@@ -81,8 +85,10 @@
 
 enum {
     FLAG_ONEWAY = FLAG_ONEWAY,
+#if defined(ANDROID_PLATFORM) || defined(__ANDROID_VENDOR__)
     FLAG_CLEAR_BUF = FLAG_CLEAR_BUF,
     FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_LOCAL,
+#endif
 };
 
 } // namespace consts