commit 3577a9381fcffb73dea651c24a2b50305c122a26
author Florian Mayer <fmayer@google.com> Tue Sep 17 13:37:21 2024 -0700
committer Florian Mayer <fmayer@google.com> Tue Sep 17 14:18:29 2024 -0700
tree 590e134f7c04e79d8908741072375f2df913bb29
parent 312e74ad0ab3e007df8b2c39ad7a8e50a8148523

Add static variant of hwasan_test

Test: atest hwasan_test hwasan_test_static
Change-Id: I2cd93e4d7e8c76dceffea4a287c1645cb22f4e3f

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index deb2843..d1ca78f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1083,8 +1083,8 @@
     ],
 }
 
-cc_test {
-    name: "hwasan_test",
+cc_defaults {
+    name: "hwasan_test_defaults",
     enabled: false,
     // This does not use bionic_tests_defaults because it is not supported on
     // host.
@@ -1099,9 +1099,6 @@
     srcs: [
         "hwasan_test.cpp",
     ],
-    shared_libs: [
-        "libbase",
-    ],
     data_libs: [
         "libtest_simple_hwasan",
         "libtest_simple_hwasan_nohwasan",
@@ -1111,6 +1108,24 @@
 }
 
 cc_test {
+    name: "hwasan_test",
+    defaults: ["hwasan_test_defaults"],
+    shared_libs: [
+        "libbase",
+    ],
+}
+
+cc_test {
+    name: "hwasan_test_static",
+    defaults: ["hwasan_test_defaults"],
+    static_libs: [
+        "libbase",
+    ],
+    static_executable: true,
+    cflags: ["-DHWASAN_TEST_STATIC"],
+}
+
+cc_test {
     name: "memtag_stack_dlopen_test",
     enabled: false,
     // This does not use bionic_tests_defaults because it is not supported on