commit 47f8c4f07bc8ce8ce7fba66d93114e948cc01d8e
author Andrei Homescu <ahomescu@google.com> Sat Apr 30 01:38:24 2022 +0000
committer Andrei Homescu <ahomescu@google.com> Thu May 19 03:19:42 2022 +0000
tree 7c4fe43c74bacf6f934a3985464adba7410f3a05
parent 7cdf5c26a1c53eae846c87e10eb2d2f34a8a2f34

libbinder: disable JavaThreadAttacher on non-Android OSes

Bug: 224644083
Test: m
Change-Id: Ibfa0535fa09af569f55aa1e6b8d5ff6adb720eb3

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 6c48c88..6ae5357 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -43,7 +43,7 @@
 #include "RpcWireFormat.h"
 #include "Utils.h"
 
-#ifndef __ANDROID_RECOVERY__
+#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)
 #include <android_runtime/vm.h>
 #include <jni.h>
 #endif
@@ -316,7 +316,7 @@
 }
 
 namespace {
-#ifdef __ANDROID_RECOVERY__
+#if !defined(__ANDROID__) || defined(__ANDROID_RECOVERY__)
 class JavaThreadAttacher {};
 #else
 // RAII object for attaching / detaching current thread to JVM if Android Runtime exists. If