Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cdffb4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove libandroid_runtime_vm_headers dependency from libbinder" am:... 

Merge "Remove libandroid_runtime_vm_headers dependency from libbinder" am: ec54b47b am: 2ede6ac1 am: 30b1200e

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



Change-Id: I2df7432d6278b72ae844db2e008eec1b1702dbe7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 597edb3e 30b1200e

libs/binder/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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",

            ],

        },

    },

libs/binder/RpcSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 {