commit 45d14ab02f41165c6e79096f2ddcdc09efcca894
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 27 23:24:11 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 27 23:24:11 2024 +0000
tree 15cd222aec398f5eedf329dbd071e67c6ba7dd94
parent d373b6f60a2bf0e319dbc59bab231226fd26d305
parent c58a42c3720bcf28084fe35229ca86fd2e083bbf

Snap for 12283639 from c58a42c3720bcf28084fe35229ca86fd2e083bbf to 24Q4-release

Change-Id: Ic2573383d7b5b378b4ab2fb63c2f6c6e41cc34b9

debuggerd/debuggerd_test.cpp

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.