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

Commit 0b6002db authored by David Su's avatar David Su Committed by Automerger Merge Worker
Browse files

Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b6 am:... 

Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b6 am: 6c9fe5a3 am: 87cbfbff

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

Change-Id: Icbec3aa5f645e915bda85c9e37755e7ae60d0331
parents 41e647ef 87cbfbff

services/net/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 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,

// TODO(b/172457099): 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",

        ":net-utils-services-common-srcs",

        "java/android/net/ip/IpClientCallbacks.java",

        "java/android/net/ip/IpClientManager.java",

        "java/android/net/ip/IpClientUtil.java",
@@ -39,6 +40,7 @@ java_library { 
        "java/android/net/TcpKeepalivePacketData.java",

    ],

    sdk_version: "module_current",

    min_sdk_version: "30",

    libs: [

        "unsupportedappusage",

        "framework-wifi-util-lib",
@@ -49,7 +51,6 @@ java_library { 
        "netd_aidl_interface-V3-java",

        "netlink-client",

        "networkstack-client",

        "net-utils-services-common",

    ],

    apex_available: [

        "com.android.wifi",