diff options
| author | Chalard Jean <jchalard@google.com> | 2020-07-31 20:00:30 +0900 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2020-08-07 03:31:04 +0000 |
| commit | be0070934470a8eac43db2ee1a9eaa33d3d3ee41 (patch) | |
| tree | 78165520eee9958d276e721eb0ca628f3de18729 /Android.bp | |
| parent | e5e46c6dfda90017e43b7c1c579b2099647bb004 (diff) | |
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.
Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 8e2f0ec8b639..c303f5490d57 100644 --- a/Android.bp +++ b/Android.bp @@ -718,7 +718,6 @@ filegroup { "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", ], } @@ -728,7 +727,6 @@ java_library { 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: [ @@ -745,7 +743,6 @@ filegroup { 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", ], @@ -762,7 +759,6 @@ filegroup { "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", ], } |