Move net-test-utils to its own directory
Having the test targets in a different directory allows setting
visibility rules for tests only, which is necessary for access to
targets that should not be used for device builds.
Bug: 182859030
Test: m
Change-Id: Iaf426cf339a97833acf80c941db692329c6e2dcb
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 03296e7..74aafd3 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -59,6 +59,7 @@
"//packages/modules/NetworkStack:__subpackages__",
"//packages/modules/CaptivePortalLogin",
"//frameworks/libs/net/common/tests:__subpackages__",
+ "//frameworks/libs/net/common/testutils:__subpackages__",
],
static_libs: [
"net-utils-framework-common",
@@ -68,25 +69,6 @@
],
}
-java_library {
- // Consider using net-tests-utils instead if writing device code.
- // That library has a lot more useful tools into it for users that
- // work on Android and includes this lib.
- name: "net-tests-utils-host-device-common",
- srcs: [
- "hostdevice/**/*.java",
- "hostdevice/**/*.kt",
- ],
- host_supported: true,
- visibility: [
- "//frameworks/libs/net/common/tests:__subpackages__",
- "//frameworks/libs/net/client-libs/tests:__subpackages__",
- ],
- static_libs: [
- "kotlin-test"
- ]
-}
-
java_defaults {
name: "lib_mockito_extended",
static_libs: [
@@ -98,25 +80,6 @@
],
}
-java_library {
- name: "net-tests-utils",
- srcs: [
- "devicetests/**/*.java",
- "devicetests/**/*.kt",
- ],
- defaults: ["lib_mockito_extended"],
- libs: [
- "androidx.annotation_annotation",
- ],
- static_libs: [
- "androidx.test.ext.junit",
- "kotlin-reflect",
- "libnanohttpd",
- "net-tests-utils-host-device-common",
- "net-utils-device-common",
- ],
-}
-
filegroup {
name: "net-utils-framework-common-srcs",
srcs: ["framework/**/*.java"],