summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-10-15 10:21:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-10-15 10:21:25 +0000
commitf184d40178e53732d842f73d23d0e27285dc0b91 (patch)
treeb388c2cf77a916c7e82db1666233236629d60deb
parent16402fc4c3aa3d4b4ecf3e008177bce275270437 (diff)
parent4ea8a1fbae5de7bb131a800596de4030497980c3 (diff)
Merge "Add imports to networking test mapping"
-rw-r--r--core/java/android/net/TEST_MAPPING20
-rw-r--r--services/net/TEST_MAPPING7
-rw-r--r--tests/net/TEST_MAPPING5
3 files changed, 32 insertions, 0 deletions
diff --git a/core/java/android/net/TEST_MAPPING b/core/java/android/net/TEST_MAPPING
new file mode 100644
index 000000000000..abac81117deb
--- /dev/null
+++ b/core/java/android/net/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+ "imports": [
+ {
+ // Also includes cts/tests/tests/net
+ "path": "frameworks/base/tests/net"
+ },
+ {
+ "path": "packages/modules/NetworkStack"
+ },
+ {
+ "path": "packages/modules/CaptivePortalLogin"
+ },
+ {
+ "path": "frameworks/base/packages/Tethering"
+ },
+ {
+ "path": "frameworks/opt/net/wifi"
+ }
+ ]
+} \ No newline at end of file
diff --git a/services/net/TEST_MAPPING b/services/net/TEST_MAPPING
new file mode 100644
index 000000000000..7025dd178e0f
--- /dev/null
+++ b/services/net/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "imports": [
+ {
+ "path": "frameworks/base/core/java/android/net"
+ }
+ ]
+} \ No newline at end of file
diff --git a/tests/net/TEST_MAPPING b/tests/net/TEST_MAPPING
index 005cbe9ffdc4..89fc6ea2c47b 100644
--- a/tests/net/TEST_MAPPING
+++ b/tests/net/TEST_MAPPING
@@ -8,5 +8,10 @@
{
"name": "FrameworksNetDeflakeTest"
}
+ ],
+ "imports": [
+ {
+ "path": "cts/tests/tests/net"
+ }
]
} \ No newline at end of file