commit 93492c35d31d9fe2526b06260923db8fcc86b278
author Matthew Maurer <mmaurer@google.com> Fri Nov 20 01:10:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 01:10:53 2020 +0000
tree 18005d273cb43c81571a48d1192b1cfe02a89108
parent 91068b603449766ff0161d9f1bc9e4e168eff649
parent 5a5b85d4f80619a5ab29fd1f1e7fef9db4fbd2f9

Merge "Move Rust Binder tests into libbinder TEST_MAPPING" am: 5a5b85d4f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1506416

Change-Id: Ibabe50b26bcd41e77bde2956945591c000b29d82

libs/binder/TEST_MAPPING

diff --git a/libs/binder/TEST_MAPPING b/libs/binder/TEST_MAPPING
index 61a611d..dafc879 100644
--- a/libs/binder/TEST_MAPPING
+++ b/libs/binder/TEST_MAPPING
@@ -50,6 +50,14 @@
           "exclude-filter": "android.os.cts.StrictModeTest#testNonSdkApiUsage"
         }
       ]
+    },
+    {
+      "name": "libbinder_rs-internal_test"
+    }
+  ],
+  "postsubmit": [
+    {
+      "name": "rustBinderTest"
     }
   ]
 }

libs/binder/rust/TEST_MAPPING

diff --git a/libs/binder/rust/TEST_MAPPING b/libs/binder/rust/TEST_MAPPING
deleted file mode 100644
index 50c474c..0000000
--- a/libs/binder/rust/TEST_MAPPING
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "libbinder_rs-internal_test"
-    }
-  ],
-  "postsubmit": [
-    {
-      "name": "rustBinderTest"
-    }
-  ]
-}