commit 7b04df76a531f662e1c16ea4e54aac599cdf5f6e
author Theodore Dubois <tbodt@google.com> Mon Sep 18 11:58:48 2023 -0700
committer Theodore Dubois <tbodt@google.com> Mon Sep 18 12:04:05 2023 -0700
tree a6065becf01a16ac6af2ed4f89419b5b7abb087e
parent febd9f45056775be7f24774ab8b1015b076eefb0
parent 707a554cef39cb640da08dccb484a21926fce94b

Merge main from android.googlesource.com

Change-Id: I8f84b00b66149765b764202c440e6cd99e8e2822

Android.bp

diff --git a/Android.bp b/Android.bp
index 8eee93b..d4de976 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,6 +75,7 @@
     },
 
     cflags: [
+        "-DBINDER_WITH_KERNEL_IPC",
         "-Wall",
         "-Werror",
     ],

IPCThreadState.cpp

diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index 8631644..1ecaaed 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -932,7 +932,7 @@
         IF_LOG_COMMANDS() {
             alog << "About to read/write, write size = " << mOut.dataSize() << endl;
         }
-#if defined(__ANDROID__)
+#if defined(BINDER_WITH_KERNEL_IPC)
         if (ioctl(mProcess->mDriverFD, BINDER_WRITE_READ, &bwr) >= 0)
             err = NO_ERROR;
         else
@@ -1292,7 +1292,7 @@
         IPCThreadState* const self = static_cast<IPCThreadState*>(st);
         if (self) {
                 self->flushCommands();
-#if defined(__ANDROID__)
+#if defined(BINDER_WITH_KERNEL_IPC)
         if (self->mProcess->mDriverFD >= 0) {
             ioctl(self->mProcess->mDriverFD, BINDER_THREAD_EXIT, 0);
         }

ProcessState.cpp

diff --git a/ProcessState.cpp b/ProcessState.cpp
index d6dfa16..7b49675 100644
--- a/ProcessState.cpp
+++ b/ProcessState.cpp
@@ -419,7 +419,7 @@
         }
     }
 
-#ifdef __ANDROID__
+#ifdef BINDER_WITH_KERNEL_IPC
     LOG_ALWAYS_FATAL_IF(mDriverFD < 0, "Binder driver could not be opened. Terminating.");
 #endif
 }