commit 30b1200ebd37a9988c677c35f7388188f15d5775
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 25 03:40:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 25 03:40:03 2022 +0000
tree e0e540826148e0fb5825a97f1e91cf0b39459dfe
parent 2dcd6cf49a869cda57c1040f62b2eba1f4feb8e1
parent 2ede6ac100f0ef44e90135767368a2341f420e65

Merge "Remove libandroid_runtime_vm_headers dependency from libbinder" am: ec54b47bad am: 2ede6ac100

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2262261

Change-Id: I86d8319033f4b981ec72cae017a1ff3fcda2c663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index df36753..2362580 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 {