Merge "Add imports to networking test mapping" am: f184d40178

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982 Change-Id: I835d9c17377cee5adcc5f44cff3e1d4f0774aaa2
2020-10-15 11:07:41 +00:00
parent 2b2066096b f184d40178
commit f88f3c9f08
3 changed files with 32 additions and 0 deletions
--- a/core/java/android/net/TEST_MAPPING
+++ 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"
+    }
+  ]
+}
--- a/services/net/TEST_MAPPING
+++ b/services/net/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "frameworks/base/core/java/android/net"
+    }
+  ]
+}
--- a/tests/net/TEST_MAPPING
+++ b/tests/net/TEST_MAPPING
@@ -8,5 +8,10 @@
    {
      "name": "FrameworksNetDeflakeTest"
    }
+  ],
+  "imports": [
+    {
+      "path": "cts/tests/tests/net"
+    }
  ]
 }