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

Commit cbcb46cb authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge changes I33b70b0a,I1074eedb am: e286c5e1

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

Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
parents 62a694f8 e286c5e1
Loading
Loading
Loading
Loading
+0 −40
Original line number Diff line number Diff line
@@ -19,46 +19,6 @@ java_library_static {
    ],
}

// Version of services.net for usage by the wifi mainline module.
// Note: This is compiled against module_current.
// TODO(b/145825329): This should be moved to networkstack-client,
// with dependencies moved to frameworks/libs/net right.
java_library {
    name: "services.net-module-wifi",
    srcs: [
        ":framework-services-net-module-wifi-shared-srcs",
        ":net-module-utils-srcs",
        "java/android/net/ip/IpClientCallbacks.java",
        "java/android/net/ip/IpClientManager.java",
        "java/android/net/ip/IpClientUtil.java",
        "java/android/net/util/KeepalivePacketDataUtil.java",
        "java/android/net/util/NetworkConstants.java",
        "java/android/net/IpMemoryStore.java",
        "java/android/net/NetworkMonitorManager.java",
        "java/android/net/TcpKeepalivePacketData.java",
    ],
    sdk_version: "module_current",
    libs: [
        "unsupportedappusage",
        "framework-wifi-util-lib",
    ],
    static_libs: [
        // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the
        // classes generated by netd_aidl_interfaces-platform-java above.
        "netd_aidl_interface-V3-java",
        "netlink-client",
        "networkstack-client",
        "net-utils-services-common",
    ],
    apex_available: [
        "com.android.wifi",
    ],
    visibility: [
        "//frameworks/opt/net/wifi/service",
        "//frameworks/opt/net/wifi/tests/wifitests",
    ],
}

filegroup {
    name: "services-tethering-shared-srcs",
    srcs: [