Merge "Move variable only used on aarch64." into main am: e0ec54b436 am: 70f98e406a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3242487
Change-Id: If4e025a216a098f88e528ed1e50e6f232b6e2cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index 08619b9..962097e 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -86,7 +86,6 @@
#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 @@
}
#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.