commit cfb39b145bb4b2f0783e29863fdcafffa25cf440
author Sandeep Patil <sspatil@google.com> Sat Jan 26 20:15:05 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sat Jan 26 20:15:05 2019 -0800
tree 986630326a4f3cf3bda3e9dc06862c10c247bc40
parent e40d8f489c22b4a7cf644136461021d0c52bcd22
parent a5addb0aba3f24756a8427cd91946a39b73d700c

[automerger skipped] Merge "bionic_unit_tests: Remove dependency on libpagemap" am: 122ecb1ca8 am: 306caa7df8
am: a5addb0aba -s ours
am skip reason: change_id Ice217a91a16ee0216354608b2776c0f1e5f65c09 with SHA1 e3f39a0efc is in history

Change-Id: I6d8aee0368ddd5b51de6029c7a5cd5c1f682b06b

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,