summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alec Mouri <alecmouri@google.com> 2023-10-17 01:49:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-17 01:49:50 +0000
commit5874cb16b86d9d35e10098ef159e776d6eb3f072 (patch)
tree5da95bdf3bb9bee312238ca18bb1bd15695388c9
parent8f7cc14d215e8fa06c900b2a4593f2a2d790942e (diff)
parent0dfabe592d8d5fe5c3bdbfa10c54f0754254abcd (diff)
Merge "Remove all of ChildLayerTest from frameworks/native/TEST_MAPPING" into main am: a527c67cfa am: 0dfabe592d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2788514 Change-Id: Ie88e1bb639a24b69467fd0ce53ce597ec7fcffc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--TEST_MAPPING3
1 files changed, 2 insertions, 1 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index cd8f3cdcc2..9c0116957d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,7 +7,8 @@
"include-filter": "*"
},
{
- "exclude-filter": "*ChildLayerTest#ChildrenSurviveParentDestruction"
+ // TODO(b/305717998): Deflake and re-enable
+ "exclude-filter": "*ChildLayerTest*"
}
]
},