Merge "framework-wifi: remove duplicate classes" into rvc-dev am: 87c…

…e901 Change-Id: I29a472aa2d48f7bf1151487c2fa089bb9a2102db
land-msm-3-18 · Apr 22, 2020 · 44d450a · 44d450a
2 parents eeeffd3 + 87ce901
commit 44d450a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Android.bp b/Android.bp
@@ -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 {

diff --git a/services/net/Android.bp b/services/net/Android.bp
@@ -41,6 +41,7 @@ java_library {
     sdk_version: "module_current",
     libs: [
         "unsupportedappusage",
+        "framework-wifi-util-lib",
     ],
     static_libs: [
         "dnsresolver_aidl_interface-V2-java",