summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matthew Maurer <mmaurer@google.com> 2020-11-20 01:22:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-20 01:22:21 +0000
commit9cb2b5dff29ff9eb0635e203e22edfa54167c108 (patch)
tree055af174e74cf6caa33a830ae79040535661bbd7
parent8c8eb8dbfe5da9047c7ba6f34956d540371d07a8 (diff)
parent93492c35d31d9fe2526b06260923db8fcc86b278 (diff)
Merge "Move Rust Binder tests into libbinder TEST_MAPPING" am: 5a5b85d4f8 am: 93492c35d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1506416 Change-Id: Ib4070f1db748c9f73da43b4944f185ea18852c9f
-rw-r--r--libs/binder/TEST_MAPPING8
-rw-r--r--libs/binder/rust/TEST_MAPPING12
2 files changed, 8 insertions, 12 deletions
diff --git a/libs/binder/TEST_MAPPING b/libs/binder/TEST_MAPPING
index 61a611d5f2..dafc87952f 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"
}
]
}
diff --git a/libs/binder/rust/TEST_MAPPING b/libs/binder/rust/TEST_MAPPING
deleted file mode 100644
index 50c474cdf2..0000000000
--- a/libs/binder/rust/TEST_MAPPING
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "presubmit": [
- {
- "name": "libbinder_rs-internal_test"
- }
- ],
- "postsubmit": [
- {
- "name": "rustBinderTest"
- }
- ]
-}