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

Commit 19ba99d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove libandroid_runtime_vm_headers" am: 3bf2c7e4 am: b62d913c am: 056b9607 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268626



Change-Id: Ib5ad5d31ece4ea3b8d27e87f6f4d1cb81115bdaf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27cf3b5e 056b9607

core/jni/Android.bp

+0 −22
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ cc_library_shared { 
            header_libs: [

                "bionic_libc_platform_headers",

                "dnsproxyd_protocol_headers",

                "libandroid_runtime_vm_headers",

            ],

        },

        host: {
@@ -418,24 +417,3 @@ cc_library_shared { 
        never: true,

    },

}
 


cc_library_headers {

    name: "libandroid_runtime_vm_headers",

    host_supported: true,

    vendor_available: true,

    // TODO(b/153609531): remove when libbinder is not native_bridge_supported

    native_bridge_supported: true,

    // Allow only modules from the following list to create threads that can be

    // attached to the JVM. This list should be a subset of the dependencies of

    // libandroid_runtime.

    visibility: [

        "//frameworks/native/libs/binder",

    ],

    export_include_dirs: ["include_vm"],

    header_libs: [

        "jni_headers",

    ],

    export_header_lib_headers: [

        "jni_headers",

    ],

}

core/jni/AndroidRuntime.cpp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <android-base/properties.h>

#include <android/graphics/jni_runtime.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_runtime/vm.h>

#include <assert.h>

#include <binder/IBinder.h>

#include <binder/IPCThreadState.h>

core/jni/include_vm/android_runtime/vm.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <jni.h>



// Get the Java VM. If the symbol doesn't exist at runtime, it means libandroid_runtime

// is not loaded in the current process. If the symbol exists but it returns nullptr, it

// means JavaVM is not yet started.

extern "C" JavaVM* AndroidRuntimeGetJavaVM();