Skip to content

Commit

Permalink
framework-wifi: remove duplicate classes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
David Su committed Apr 22, 2020
1 parent 0bfa60f commit 57bca31
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
}

Expand Down Expand Up @@ -1175,7 +1173,10 @@ java_library {
"framework-annotations-lib",
"unsupportedappusage",
],
visibility: ["//frameworks/base/wifi"],
visibility: [
"//frameworks/base/wifi",
"//frameworks/base/services/net",
],
}

filegroup {
Expand Down
1 change: 1 addition & 0 deletions services/net/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ java_library {
sdk_version: "module_current",
libs: [
"unsupportedappusage",
"framework-wifi-util-lib",
],
static_libs: [
"dnsresolver_aidl_interface-V2-java",
Expand Down

0 comments on commit 57bca31

Please sign in to comment.