Merge "dex/TEST_MAPPING: referenced non-test modules"

am: 81f32238ea Change-Id: Ief1b1646f7ed2d22e70aa2346eb7ac5c17880640
2018-10-10 15:18:57 -07:00
parent cecccf6258 81f32238ea
commit 2b1e2fff16
1 changed files with 6 additions and 13 deletions
--- a/services/core/java/com/android/server/pm/dex/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/dex/TEST_MAPPING
@@ -1,19 +1,12 @@
 {
  "presubmit": [
    {
-      "name": "DexLoggerTests"
-    },
-    {
-      "name": "DexManagerTests"
-    },
-    {
-      "name": "DexoptOptionsTests"
-    },
-    {
-      "name": "DexoptUtilsTest"
-    },
-    {
-      "name": "PackageDexUsageTests"
+      "name": "FrameworksServicesTests",
+      "options": [
+        {
+          "include-filter": "com.android.server.pm.dex"
+        }
+      ]
    },
    {
      "name": "DexLoggerIntegrationTests"