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

Commit 912b26d9 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Split connectivity JNI and service jar 

The VPN JNI code is moving to the tethering APEX with
ConnectivityService, so it needs to be split out of libandroid_servers.

Also move the service-connectivity.jar build rule to
packages/Connectivity together with the jni build rule.

Bug: 171540887
Test: m, device boots and VPN (L2TP and VpnService) verified working
Change-Id: Ic29096e2280ce928729315f53b2159b620da49d5
parent ba3f1179

packages/Connectivity/service/Android.bp

0 → 100644
+79 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 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.

//



cc_defaults {

    name: "libservice-connectivity-defaults",

    // TODO: build against the NDK (sdk_version: "30" for example)

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

        "-Wthread-safety",

    ],

    srcs: [

        "jni/com_android_server_TestNetworkService.cpp",

        "jni/com_android_server_connectivity_Vpn.cpp",

    ],

    shared_libs: [

        "libbase",

        "liblog",

        "libnativehelper",

        // TODO: remove dependency on ifc_[add/del]_address by having Java code to add/delete

        // addresses, and remove dependency on libnetutils.

        "libnetutils",

    ],

}



cc_library_shared {

    name: "libservice-connectivity",

    defaults: ["libservice-connectivity-defaults"],

    srcs: [

        "jni/onload.cpp",

    ],

    apex_available: [

        // TODO: move this library to the tethering APEX and remove libservice-connectivity-static

        // "com.android.tethering",

    ],

}



// Static library linked into libservices.core until libservice-connectivity can be loaded from

// the tethering APEX instead.

cc_library_static {

    name: "libservice-connectivity-static",

    defaults: ["libservice-connectivity-defaults"],

}



java_library {

    name: "service-connectivity",

    srcs: [

        ":connectivity-service-srcs",

    ],

    installable: true,

    jarjar_rules: "jarjar-rules.txt",

    libs: [

        "android.net.ipsec.ike",

        "services.core",

        "services.net",

        "unsupportedappusage",

    ],

    static_libs: [

        "net-utils-device-common",

        "net-utils-framework-common",

    ],

    apex_available: [

        "//apex_available:platform",

    ],

}

packages/Connectivity/service/jarjar-rules.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
rule com.android.net.module.util.** com.android.connectivity.util.@1
 
 No newline at end of file

services/core/jni/com_android_server_connectivity_Vpn.cpp→packages/Connectivity/service/jni/com_android_server_connectivity_Vpn.cpp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <sys/types.h>



#include <log/log.h>

#include <android/log.h>



#include "netutils/ifc.h"

packages/Connectivity/service/jni/onload.cpp

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.

 */



#include <nativehelper/JNIHelp.h>

#include <log/log.h>



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*) {

    JNIEnv *env;

    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {

        ALOGE("GetEnv failed");

        return JNI_ERR;

    }



    if (register_android_server_connectivity_Vpn(env) < 0

        || register_android_server_TestNetworkService(env) < 0) {

        return JNI_ERR;

    }



    return JNI_VERSION_1_6;

}



};
 
 No newline at end of file