Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "framework-wifi: remove duplicate classes" into rvc-dev am: 87ce901869 am: 44d450a87e

Browse Source 
Change-Id: Ifbde88bdb780525f248fdb4eb03920fe0b318e6c
This commit is contained in:
David Su
2020-04-22 19:02:29 +00:00
committed by Automerger Merge Worker
parent c551feb9b6 44d450a87e
commit 0908e5040c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.bp
View File

@@ -708,11 +708,9 @@ filegroup {
name: "framework-services-net-module-wifi-shared-srcs", name: "framework-services-net-module-wifi-shared-srcs",
srcs: [ srcs: [
"core/java/android/net/DhcpResults.java", "core/java/android/net/DhcpResults.java",
"core/java/android/net/shared/Inet4AddressUtils.java",
"core/java/android/net/shared/InetAddressUtils.java", "core/java/android/net/shared/InetAddressUtils.java",
"core/java/android/net/util/IpUtils.java", "core/java/android/net/util/IpUtils.java",
"core/java/android/util/LocalLog.java", "core/java/android/util/LocalLog.java",
"core/java/com/android/internal/util/Preconditions.java",
], ],
} }
@@ -1175,7 +1173,10 @@ java_library {
"framework-annotations-lib", "framework-annotations-lib",
"unsupportedappusage", "unsupportedappusage",
], ],
visibility: ["//frameworks/base/wifi"], visibility: [
"//frameworks/base/wifi",
"//frameworks/base/services/net",
],
} }
filegroup { filegroup {

1
services/net/Android.bp
View File

@@ -41,6 +41,7 @@ java_library {
sdk_version: "module_current", sdk_version: "module_current",
libs: [ libs: [
"unsupportedappusage", "unsupportedappusage",
"framework-wifi-util-lib",
], ],
static_libs: [ static_libs: [
"dnsresolver_aidl_interface-V2-java", "dnsresolver_aidl_interface-V2-java",