diff options
| author | Peter Collingbourne <pcc@google.com> | 2020-12-21 14:08:38 -0800 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2021-01-11 10:55:51 -0800 |
| commit | 7e20117a36c6cf7d3fbdee9b2ed4426c72185346 (patch) | |
| tree | 100f96c73a64901a062ec4e0519bc278c2034827 /tests/malloc_test.cpp | |
| parent | e09fc24a94c1a196b8930f8f26c6f5f8c1a47d06 (diff) | |
Remove ANDROID_EXPERIMENTAL_MTE.
Now that the feature guarded by this flag has landed in Linux 5.10
we no longer need the flag, so we can remove it.
Bug: 135772972
Change-Id: I02fa50848cbd0486c23c8a229bb8f1ab5dd5a56f
Diffstat (limited to 'tests/malloc_test.cpp')
| -rw-r--r-- | tests/malloc_test.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index ddd3416be..bddd9ab63 100644 --- a/tests/malloc_test.cpp +++ b/tests/malloc_test.cpp @@ -47,7 +47,6 @@ #include "platform/bionic/malloc.h" #include "platform/bionic/mte.h" -#include "platform/bionic/mte_kernel.h" #include "platform/bionic/reserved_signals.h" #include "private/bionic_config.h" @@ -1263,7 +1262,6 @@ TEST(android_mallopt, disable_memory_mitigations) { GTEST_SKIP() << "This function can only be tested with MTE"; } -#ifdef ANDROID_EXPERIMENTAL_MTE sem_t sem; ASSERT_EQ(0, sem_init(&sem, 0, 0)); @@ -1287,7 +1285,6 @@ TEST(android_mallopt, disable_memory_mitigations) { ASSERT_EQ(0, pthread_join(thread, &retval)); int thread_tagged_addr_ctrl = reinterpret_cast<uintptr_t>(retval); ASSERT_EQ(my_tagged_addr_ctrl, thread_tagged_addr_ctrl); -#endif #else GTEST_SKIP() << "bionic extension"; #endif |