commit 0c47d45a1d76e4ed15c44693dfd4b80b25e62e82
author Jeongik Cha <jeongik@google.com> Thu Oct 20 00:07:55 2022 +0900
committer Jeongik Cha <jeongik@google.com> Thu Oct 20 00:09:44 2022 +0900
tree d70bac67a588842f9eeaa9d0de97806587eca7e7
parent 866e5471742add0442ca03c269b4c269b2c4ab92

Remove libandroid_runtime_vm_headers dependency from libbinder

Instead, add extern C definition in the RpcSession.cpp directly

Bug: 254459965
Test: m libbinder
Change-Id: I093f0952f12d575b4a517314c5dadef5b7125a62

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index df965ab..7370076 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -161,7 +161,7 @@
     ],
 
     header_libs: [
-        "libandroid_runtime_vm_headers",
+        "jni_headers",
     ],
 
     export_header_lib_headers: [
@@ -315,7 +315,7 @@
         },
         recovery: {
             exclude_header_libs: [
-                "libandroid_runtime_vm_headers",
+                "jni_headers",
             ],
         },
     },

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 7d6bcfc..0059171 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -46,8 +46,8 @@
 #include "Utils.h"
 
 #if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)
-#include <android_runtime/vm.h>
 #include <jni.h>
+extern "C" JavaVM* AndroidRuntimeGetJavaVM();
 #endif
 
 namespace android {