Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70f98e40 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Move variable only used on aarch64." into main am: e0ec54b4 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3242487



Change-Id: Id687bebae10127a6fab02d65dad4b59244783996
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7e708bf e0ec54b4

debuggerd/debuggerd_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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.