summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Florian Mayer <fmayer@google.com> 2023-03-23 00:39:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-23 00:39:08 +0000
commit00a0ba5d5883d0025d6c8681d35a49fa593bfd43 (patch)
treeec2c289d57f945a3f065b189a58b248ea9a35a8c
parente8e1dcadba3c88ba08ec76a22250314d35a0e620 (diff)
parent71954b5a70c25dec1bc0b4a0861d7024c698438e (diff)
Merge "Move libscheduler_test off ASan and add to presubmit" am: 15de6b5f2a am: 3956f44c44 am: 71954b5a70
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2479939 Change-Id: If2f0fbb6dabf2621d5e1444ceb7d53bfab20823f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/surfaceflinger/Scheduler/Android.bp3
-rw-r--r--services/surfaceflinger/TEST_MAPPING8
2 files changed, 8 insertions, 3 deletions
diff --git a/services/surfaceflinger/Scheduler/Android.bp b/services/surfaceflinger/Scheduler/Android.bp
index 5bd8a99361..d5d868839f 100644
--- a/services/surfaceflinger/Scheduler/Android.bp
+++ b/services/surfaceflinger/Scheduler/Android.bp
@@ -60,7 +60,4 @@ cc_test {
"libgtest",
"libscheduler",
],
- sanitize: {
- address: true,
- },
}
diff --git a/services/surfaceflinger/TEST_MAPPING b/services/surfaceflinger/TEST_MAPPING
index cab33ae379..57752b7a39 100644
--- a/services/surfaceflinger/TEST_MAPPING
+++ b/services/surfaceflinger/TEST_MAPPING
@@ -5,6 +5,14 @@
},
{
"name": "libcompositionengine_test"
+ },
+ {
+ "name": "libscheduler_test"
+ }
+ ],
+ "hwasan-presubmit": [
+ {
+ "name": "libscheduler_test"
}
]
}