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

Commit c58a42c3 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 am: 70f98e40 

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



Change-Id: If4e025a216a098f88e528ed1e50e6f232b6e2cb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41a5cee6 70f98e40

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.