commit a35580e0ddd07721a1eae3fdbca7e518ea68780c
author Chalard Jean <jchalard@google.com> Thu Jul 02 13:59:44 2020 +0000
committer Remi NGUYEN VAN <reminv@google.com> Thu Jul 02 23:47:35 2020 +0000
tree 49de84c12158c3124416a99f0868091aae205b3f
parent 57d68e3c55176083ba40947be8f335534d958006

Revert "Move Inet[4]AddressUtils to libs/net"

This reverts commit 57d68e3c55176083ba40947be8f335534d958006.

Reason for revert: Breaks the build b/160390899

Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44

Android.bp

diff --git a/Android.bp b/Android.bp
index 7d38a69..a93a155 100644
--- a/Android.bp
+++ b/Android.bp
@@ -717,6 +717,7 @@
         "core/java/com/android/internal/util/TrafficStatsConstants.java",
         "core/java/com/android/internal/util/WakeupMessage.java",
         "core/java/com/android/internal/util/TokenBucket.java",
+        "core/java/android/net/shared/*.java",
     ],
 }
 
@@ -726,6 +727,7 @@
     name: "framework-wifi-util-lib",
     sdk_version: "module_current",
     srcs: [
+        "core/java/android/net/shared/Inet4AddressUtils.java",
         "core/java/com/android/internal/util/Preconditions.java",
     ],
     libs: [
@@ -742,6 +744,7 @@
     name: "framework-services-net-module-wifi-shared-srcs",
     srcs: [
         "core/java/android/net/DhcpResults.java",
+        "core/java/android/net/shared/InetAddressUtils.java",
         "core/java/android/net/util/IpUtils.java",
         "core/java/android/util/LocalLog.java",
     ],
@@ -758,6 +761,7 @@
         "core/java/com/android/internal/util/State.java",
         "core/java/com/android/internal/util/StateMachine.java",
         "core/java/com/android/internal/util/TrafficStatsConstants.java",
+        "core/java/android/net/shared/Inet4AddressUtils.java",
     ],
 }