commit 40cb3f80f625ba4075d8417f93e7c521ee7f3673
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 10 23:45:11 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 10 23:45:11 2023 +0000
tree dda050c52462020187a52bda7a8d94ea7cf30c3a
parent ba1e0c94b0af2388707ad6feea7ddd0f9184cd6d
parent 36e64fa1cfc4c1ef36fb858adcaa02abd92087a0

Merge "Add TEST_MAPPING and migrate ftl_test to hwasan" am: 771ba1e0c8 am: 36e64fa1cf

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

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

libs/ftl/Android.bp

diff --git a/libs/ftl/Android.bp b/libs/ftl/Android.bp
index c010a2e..09422d3 100644
--- a/libs/ftl/Android.bp
+++ b/libs/ftl/Android.bp
@@ -10,9 +10,6 @@
 cc_test {
     name: "ftl_test",
     test_suites: ["device-tests"],
-    sanitize: {
-        address: true,
-    },
     srcs: [
         "cast_test.cpp",
         "concat_test.cpp",

libs/ftl/TEST_MAPPING

diff --git a/libs/ftl/TEST_MAPPING b/libs/ftl/TEST_MAPPING
new file mode 100644
index 0000000..ec0c671
--- /dev/null
+++ b/libs/ftl/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit": [
+    {
+      "name": "ftl_test"
+    }
+  ],
+  "hwasan-presubmit": [
+    {
+      "name": "ftl_test"
+    }
+  ]
+}