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

Commit 6011d524 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Move the VPN code out of packages/Connectivity." am: 8269d21d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44cf61bec31d83217ca836aa387030818cd226cb
parents 8cec61d8 8269d21d

packages/Connectivity/service/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ cc_library_shared { 
    ],

    srcs: [

        "jni/com_android_server_TestNetworkService.cpp",

        "jni/com_android_server_connectivity_Vpn.cpp",

        "jni/onload.cpp",

    ],

    shared_libs: [

packages/Connectivity/service/jni/onload.cpp

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


namespace android {



int register_android_server_connectivity_Vpn(JNIEnv* env);

int register_android_server_TestNetworkService(JNIEnv* env);



extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
@@ -29,8 +28,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void*) { 
        return JNI_ERR;

    }



    if (register_android_server_connectivity_Vpn(env) < 0

        || register_android_server_TestNetworkService(env) < 0) {

    if (register_android_server_TestNetworkService(env) < 0) {

        return JNI_ERR;

    }

services/core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ cc_library_static { 
        "com_android_server_am_BatteryStatsService.cpp",

        "com_android_server_ConsumerIrService.cpp",

        "com_android_server_devicepolicy_CryptoTestHelper.cpp",

        "com_android_server_connectivity_Vpn.cpp",

        "com_android_server_gpu_GpuService.cpp",

        "com_android_server_HardwarePropertiesManagerService.cpp",

        "com_android_server_input_InputManagerService.cpp",