Merge "Revert "Add mdns tests to ConnectivityCoverageTests"" am: 2575e05740
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2169303 Change-Id: I267261496afce9da2c89fbf2f9e75c07517f1d7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -74,6 +74,7 @@ filegroup {
|
|||||||
"java/com/android/server/connectivity/NetdEventListenerServiceTest.java",
|
"java/com/android/server/connectivity/NetdEventListenerServiceTest.java",
|
||||||
"java/com/android/server/connectivity/VpnTest.java",
|
"java/com/android/server/connectivity/VpnTest.java",
|
||||||
"java/com/android/server/net/ipmemorystore/*.java",
|
"java/com/android/server/net/ipmemorystore/*.java",
|
||||||
|
"java/com/android/server/connectivity/mdns/**/*.java",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,8 +116,7 @@ java_defaults {
|
|||||||
"service-connectivity-pre-jarjar",
|
"service-connectivity-pre-jarjar",
|
||||||
"service-connectivity-tiramisu-pre-jarjar",
|
"service-connectivity-tiramisu-pre-jarjar",
|
||||||
"services.core-vpn",
|
"services.core-vpn",
|
||||||
"cts-net-utils",
|
"cts-net-utils"
|
||||||
"service-mdns",
|
|
||||||
],
|
],
|
||||||
libs: [
|
libs: [
|
||||||
"android.net.ipsec.ike.stubs.module_lib",
|
"android.net.ipsec.ike.stubs.module_lib",
|
||||||
@@ -149,6 +149,7 @@ android_test {
|
|||||||
static_libs: [
|
static_libs: [
|
||||||
"services.core",
|
"services.core",
|
||||||
"services.net",
|
"services.net",
|
||||||
|
"service-mdns",
|
||||||
],
|
],
|
||||||
jni_libs: [
|
jni_libs: [
|
||||||
"libandroid_net_connectivity_com_android_net_module_util_jni",
|
"libandroid_net_connectivity_com_android_net_module_util_jni",
|
||||||
|
|||||||
Reference in New Issue
Block a user