Merge "Move variable only used on aarch64." into main

This commit is contained in:
Christopher Ferris 2024-08-27 16:20:46 +00:00 committed by Gerrit Code Review
commit e0ec54b436

View file

@ -86,7 +86,6 @@ using ::testing::HasSubstr;
#define ARCH_SUFFIX ""
#endif
constexpr size_t kTagGranuleSize = 16;
constexpr char kWaitForDebuggerKey[] = "debug.debuggerd.wait_for_debugger";
#define TIMEOUT(seconds, expr) \
@ -742,6 +741,8 @@ TEST_F(CrasherTest, mte_multiple_causes) {
}
#if defined(__aarch64__)
constexpr size_t kTagGranuleSize = 16;
static uintptr_t CreateTagMapping() {
// Some of the MTE tag dump tests assert that there is an inaccessible page to the left and right
// of the PROT_MTE page, so map three pages and set the two guard pages to PROT_NONE.