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

Commit 20be4016 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Build service-connectivity with system_server API" into sc-dev am: 17ea6fca 

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

Change-Id: I52e790a88be92011956baf48a6d14e04a900a518
parents 2d6ac035 17ea6fca

packages/Connectivity/service/Android.bp

+17 −4
Original line number Diff line number Diff line
@@ -51,22 +51,33 @@ cc_library_shared { 


java_library {

    name: "service-connectivity-pre-jarjar",

    sdk_version: "system_server_current",

    srcs: [

        ":framework-connectivity-shared-srcs",

        ":connectivity-service-srcs",

        ":framework-connectivity-shared-srcs",

        ":services-connectivity-shared-srcs",

        // TODO: move to net-utils-device-common, enable shrink optimization to avoid extra classes

        ":net-module-utils-srcs",

    ],

    libs: [

        "android.net.ipsec.ike",

        "services.core",

        "services.net",

        // TODO (b/183097033) remove once system_server_current includes core_current

        "stable.core.platform.api.stubs",

        "android_system_server_stubs_current",

        "framework-annotations-lib",

        "framework-connectivity.impl",

        "framework-tethering.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

        "unsupportedappusage",

        "ServiceConnectivityResources",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-V7-java",

        "modules-utils-os",

        "net-utils-device-common",

        "net-utils-framework-common",

        "netd-client",

        "netlink-client",

        "networkstack-client",

        "PlatformProperties",

        "service-connectivity-protos",

    ],
@@ -78,6 +89,7 @@ java_library { 


java_library {

    name: "service-connectivity-protos",

    sdk_version: "system_current",

    proto: {

        type: "nano",

    },
@@ -93,6 +105,7 @@ java_library { 


java_library {

    name: "service-connectivity",

    sdk_version: "system_server_current",

    installable: true,

    static_libs: [

        "service-connectivity-pre-jarjar",

services/core/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ filegroup { 
    srcs: [

        "java/com/android/server/ConnectivityService.java",

        "java/com/android/server/ConnectivityServiceInitializer.java",

        "java/com/android/server/NetIdManager.java",

        "java/com/android/server/TestNetworkService.java",

        "java/com/android/server/connectivity/AutodestructReference.java",

        "java/com/android/server/connectivity/ConnectivityConstants.java",
@@ -235,7 +236,9 @@ filegroup { 
        "java/com/android/server/connectivity/NetworkDiagnostics.java",

        "java/com/android/server/connectivity/NetworkNotificationManager.java",

        "java/com/android/server/connectivity/NetworkRanker.java",

        "java/com/android/server/connectivity/OsCompat.java",

        "java/com/android/server/connectivity/PermissionMonitor.java",

        "java/com/android/server/connectivity/ProfileNetworkPreferences.java",

        "java/com/android/server/connectivity/ProxyTracker.java",

        "java/com/android/server/connectivity/QosCallbackAgentConnection.java",

        "java/com/android/server/connectivity/QosCallbackTracker.java",

services/net/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -83,3 +83,15 @@ filegroup { 
        "//packages/modules/Connectivity/Tethering"

    ],

}



filegroup {

    name: "services-connectivity-shared-srcs",

    srcs: [

        // TODO: move to networkstack-client

        "java/android/net/IpMemoryStore.java",

        "java/android/net/NetworkMonitorManager.java",

        // TODO: move to libs/net

        "java/android/net/util/KeepalivePacketDataUtil.java",

        "java/android/net/util/NetworkConstants.java",

    ],

}