diff options
| author | David Su <dysu@google.com> | 2020-04-21 19:49:32 -0700 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2020-04-22 05:40:28 +0000 |
| commit | 57bca318f1401c200a75aa20e0f1e9e97f69131a (patch) | |
| tree | 02472aaab01e8ab5a12d4510c1093669b299a1c9 /Android.bp | |
| parent | 0bfa60f20bed36fedea4594902cc2e1cb8645b37 (diff) | |
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
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index bd30de2c6749..8d3b4af82bc8 100644 --- 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 { |