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

Commit 859749f3 authored by Vilas Bhat's avatar Vilas Bhat Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Remove hardcoded PAGE_SIZE usage in binderLibTest" into main...

Merge "libbinder: Remove hardcoded PAGE_SIZE usage in binderLibTest" into main am: ae4eccc2 am: 7ffb5941

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2958970



Change-Id: I54a2acc898459e786935e967f3a1746aa04f9074
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 098f6851 7ffb5941
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ MATCHER_P(StatusEq, expected, (negation ? "not " : "") + statusToString(expected
}

static ::testing::AssertionResult IsPageAligned(void *buf) {
    if (((unsigned long)buf & ((unsigned long)PAGE_SIZE - 1)) == 0)
    if (((unsigned long)buf & ((unsigned long)getpagesize() - 1)) == 0)
        return ::testing::AssertionSuccess();
    else
        return ::testing::AssertionFailure() << buf << " is not page aligned";