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

Commit 72b28f26 authored by Pete Bentley's avatar Pete Bentley Committed by Colin Cross
Browse files

Revert "Move service-connectivity to the tethering APEX" 

Revert submission 1532910-connectivity_jar_in_apex

Reason for revert: Breaks boot tests: b/176969905
Reverted Changes:
Ie41a5b569:Set setCurrentProxyScriptUrl as public
Id7b6a4664:Move service-connectivity to the tethering APEX
Ia7cb83834:Add service-connectivity to tethering APEX

Change-Id: I1c369dd8a6527513f8fc1a5cacde59d78d104c7e
(cherry picked from commit 3e157018)
parent 0eed8e43

packages/Connectivity/service/Android.bp

+19 −5
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
// limitations under the License.

//



cc_library_shared {

    name: "libservice-connectivity",

cc_defaults {

    name: "libservice-connectivity-defaults",

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

    cflags: [

        "-Wall",
@@ -26,7 +26,6 @@ cc_library_shared { 
    srcs: [

        "jni/com_android_server_TestNetworkService.cpp",

        "jni/com_android_server_connectivity_Vpn.cpp",

        "jni/onload.cpp",

    ],

    shared_libs: [

        "libbase",
@@ -36,11 +35,27 @@ cc_library_shared { 
        // addresses, and remove dependency on libnetutils.

        "libnetutils",

    ],

}



cc_library_shared {

    name: "libservice-connectivity",

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

    srcs: [

        "jni/onload.cpp",

    ],

    apex_available: [

        "com.android.tethering",

        // 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: [
@@ -60,6 +75,5 @@ java_library { 
    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ java_library { 
        "services.voiceinteraction",

        "services.wifi",

        "service-blobstore",

        "service-connectivity",

        "service-jobscheduler",

        "android.hidl.base-V1.0-java",

    ],

services/core/java/com/android/server/ConnectivityServiceInitializer.java

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ public final class ConnectivityServiceInitializer extends SystemService { 


    public ConnectivityServiceInitializer(Context context) {

        super(context);

        // Load JNI libraries used by ConnectivityService and its dependencies

        System.loadLibrary("service-connectivity");

        // TODO: Define formal APIs to get the needed services.

        mConnectivity = new ConnectivityService(context, getNetworkManagementService(),

                getNetworkStatsService());

services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ final public class IpConnectivityMetrics extends SystemService { 


    public IpConnectivityMetrics(Context ctx, ToIntFunction<Context> capacityGetter) {

        super(ctx);

        // Load JNI libraries used by the IpConnectivityMetrics service and its dependencies

        System.loadLibrary("service-connectivity");

        mCapacityGetter = capacityGetter;

        initBuffer();

    }

services/core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ cc_defaults { 


    static_libs: [

        "android.hardware.broadcastradio@common-utils-1x-lib",

        "libservice-connectivity-static",

    ],



    product_variables: {