commit 5ff4c0075ea82cf8bdf3a3699f159d573e06c2bc
author Matthew Maurer <mmaurer@google.com> Fri Nov 20 02:19:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 02:19:09 2020 +0000
tree 10f389d25cd26e4451d2e12aea21b2c33bb8a874
parent 95bd9a3b44652337933355b93d6140474f8d0566
parent f6dd701a2f5c1aeb19317b3341a0408b1e4e34ac

Merge "Move Rust Binder tests into libbinder TEST_MAPPING" am: 5a5b85d4f8 am: 93492c35d3 am: 9cb2b5dff2 am: f6dd701a2f

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

Change-Id: Ia01347eb9c4f86b93c5df55186897bac20b9ad8a

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"
-    }
-  ]
-}