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

Commit ec54b47b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove libandroid_runtime_vm_headers dependency from libbinder"

parents 00cc5fe5 0c47d45a

libs/binder/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ cc_defaults { 
    ],

    ],





    header_libs: [

    header_libs: [

        "libandroid_runtime_vm_headers",

        "jni_headers",

    ],

    ],





    export_header_lib_headers: [

    export_header_lib_headers: [
@@ -315,7 +315,7 @@ cc_library { 
        },

        },

        recovery: {

        recovery: {

            exclude_header_libs: [

            exclude_header_libs: [

                "libandroid_runtime_vm_headers",

                "jni_headers",

            ],

            ],

        },

        },

    },

    },

libs/binder/RpcSession.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,8 +46,8 @@ 
#include "Utils.h"

#include "Utils.h"





#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)

#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)

#include <android_runtime/vm.h>

#include <jni.h>

#include <jni.h>

extern "C" JavaVM* AndroidRuntimeGetJavaVM();

#endif

#endif





namespace android {

namespace android {