commit 71954b5a70c25dec1bc0b4a0861d7024c698438e
author Florian Mayer <fmayer@google.com> Wed Mar 22 23:40:25 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 22 23:40:25 2023 +0000
tree de78a2c4fba769326906c557c9ebf4d686f92630
parent ace63a5b10028309e0eef056543ae60b789549a7
parent 3956f44c44ca92c978de9b881bc0f85e0d56416d

Merge "Move libscheduler_test off ASan and add to presubmit" am: 15de6b5f2a am: 3956f44c44

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

Change-Id: I33c47bbbe771d0208d0313d72e2717780f64b20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/Scheduler/Android.bp

diff --git a/services/surfaceflinger/Scheduler/Android.bp b/services/surfaceflinger/Scheduler/Android.bp
index 5de796d..8df9ba5 100644
--- a/services/surfaceflinger/Scheduler/Android.bp
+++ b/services/surfaceflinger/Scheduler/Android.bp
@@ -57,7 +57,4 @@
         "libgtest",
         "libscheduler",
     ],
-    sanitize: {
-        address: true,
-    },
 }

services/surfaceflinger/TEST_MAPPING

diff --git a/services/surfaceflinger/TEST_MAPPING b/services/surfaceflinger/TEST_MAPPING
index cab33ae..57752b7 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"
     }
   ]
 }