commit 11de8448f10820d26832f41b00e9aad039805bc4
author Florian Mayer <fmayer@google.com> Mon Jan 28 12:16:20 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 28 12:16:20 2019 -0800
tree 1f5fb3bfea77e51d45b59ffa11f9da5a58c39a61
parent cfb39b145bb4b2f0783e29863fdcafffa25cf440
parent d4bf573790cb234d824e26dea2eb6cf66f9611b5

Merge "Allow to reset malloc hooks." am: 543b4013e7 am: 70dcd3db16
am: d4bf573790

Change-Id: Iacc2a8fa512cef6680845f6cb519c2060dc2ed45

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 0a45a8e..f7273e6 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -38,6 +38,12 @@
         // For glibc.
         "-D__STDC_LIMIT_MACROS",
     ],
+    // Make the bionic tests implicitly test bionic's shadow call stack support.
+    arch: {
+        arm64: {
+           cflags: ["-fsanitize=shadow-call-stack"],
+        },
+    },
     stl: "libc++",
     sanitize: {
         never: true,