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

Commit 57bca318 authored by David Su's avatar David Su
Browse files

framework-wifi: remove duplicate classes 

Preconditions & Inet4AddressUtils are statically
linked into both framework-wifi and service-wifi.
This creates duplicate classes, which should be
avoided. Instead, service-wifi should simply refer
to the copy of Preconditions/Inet4AddressUtils in
framework-wifi.

Bug: 153596226
Test: device boots up and connects to wifi
Change-Id: Ie78e5cf0f6ff7bc8a2fa8d7264b742f912601143
parent 0bfa60f2

Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -708,11 +708,9 @@ filegroup { 
    name: "framework-services-net-module-wifi-shared-srcs",

    srcs: [

        "core/java/android/net/DhcpResults.java",

        "core/java/android/net/shared/Inet4AddressUtils.java",

        "core/java/android/net/shared/InetAddressUtils.java",

        "core/java/android/net/util/IpUtils.java",

        "core/java/android/util/LocalLog.java",

        "core/java/com/android/internal/util/Preconditions.java",

    ],

}
@@ -1175,7 +1173,10 @@ java_library { 
        "framework-annotations-lib",

        "unsupportedappusage",

    ],

    visibility: ["//frameworks/base/wifi"],

    visibility: [

        "//frameworks/base/wifi",

        "//frameworks/base/services/net",

    ],

}



filegroup {

services/net/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ java_library { 
    sdk_version: "module_current",

    libs: [

        "unsupportedappusage",

        "framework-wifi-util-lib",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-V2-java",