diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-29 17:09:13 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2021-03-30 16:52:09 +0900 |
| commit | 0fb2de46f071b50fe1e524ee16282a607a69d8c3 (patch) | |
| tree | 274988b652c09511aa12b3d12e38f2225144181f /common/Android.bp | |
| parent | 952e18da407634bbc2fe861979d46ebfb0ab581a (diff) | |
| download | net-0fb2de46f071b50fe1e524ee16282a607a69d8c3.tar.gz | |
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
Diffstat (limited to 'common/Android.bp')
| -rw-r--r-- | common/Android.bp | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/common/Android.bp b/common/Android.bp index 03296e73..74aafd30 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -59,6 +59,7 @@ java_library { "//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 { ], } -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_defaults { ], } -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"], |