commit b8ebcca6826ee6e746c0b2aec5a36f9a5402bef2
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 09 19:54:20 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Oct 12 16:07:17 2023 +0000
tree b137f7e12751be1dc4ae93e574b696a00104b6ee
parent 32746ae275593e2532a99c19b2c2e8858a042e3a

Don't depend on private/android_filesystem_config.h

Bug: 302723053
Test: mma
Change-Id: I855fedd40dc51fd3a6378f5d011a80797d590092

libs/binder/ndk/ibinder.cpp

diff --git a/libs/binder/ndk/ibinder.cpp b/libs/binder/ndk/ibinder.cpp
index f7dd9c9..47da296 100644
--- a/libs/binder/ndk/ibinder.cpp
+++ b/libs/binder/ndk/ibinder.cpp
@@ -21,7 +21,9 @@
 #include <android/binder_status.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IResultReceiver.h>
+#if __has_include(<private/android_filesystem_config.h>)
 #include <private/android_filesystem_config.h>
+#endif
 
 #include "ibinder_internal.h"
 #include "parcel_internal.h"
@@ -229,7 +231,11 @@
 
         // Shell commands should only be callable by ADB.
         uid_t uid = AIBinder_getCallingUid();
-        if (uid != AID_ROOT && uid != AID_SHELL) {
+        if (uid != 0 /* root */
+#ifdef AID_SHELL
+            && uid != AID_SHELL
+#endif
+        ) {
             if (resultReceiver != nullptr) {
                 resultReceiver->send(-1);
             }