diff options
| author | 2022-10-20 00:07:55 +0900 | |
|---|---|---|
| committer | 2022-10-20 00:09:44 +0900 | |
| commit | 0c47d45a1d76e4ed15c44693dfd4b80b25e62e82 (patch) | |
| tree | d70bac67a588842f9eeaa9d0de97806587eca7e7 | |
| parent | 866e5471742add0442ca03c269b4c269b2c4ab92 (diff) | |
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
| -rw-r--r-- | libs/binder/Android.bp | 4 | ||||
| -rw-r--r-- | libs/binder/RpcSession.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index df965ab65f..73700765e4 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -161,7 +161,7 @@ cc_defaults { ], header_libs: [ - "libandroid_runtime_vm_headers", + "jni_headers", ], export_header_lib_headers: [ @@ -315,7 +315,7 @@ cc_library { }, recovery: { exclude_header_libs: [ - "libandroid_runtime_vm_headers", + "jni_headers", ], }, }, diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index 7d6bcfc2a1..005917113b 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 { |