Merge "libbinder: Remove hardcoded PAGE_SIZE usage in binderLibTest" into main am: ae4eccc am: 7ffb594

Vilas Bhat · android-build-merge-worker-robot · commit 859749f39320 · 2024-02-14T02:11:44.000Z
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2958970 Change-Id: I54a2acc898459e786935e967f3a1746aa04f9074 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
@@ -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";

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ MATCHER_P(StatusEq, expected, (negation ? "not " : "") + statusToString(expected`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`static ::testing::AssertionResult IsPageAligned(void *buf) {`
`73`		`- if (((unsigned long)buf & ((unsigned long)PAGE_SIZE - 1)) == 0)`
	`73`	`+ if (((unsigned long)buf & ((unsigned long)getpagesize() - 1)) == 0)`
`74`	`74`	`return ::testing::AssertionSuccess();`
`75`	`75`	`else`
`76`	`76`	`return ::testing::AssertionFailure() << buf << " is not page aligned";`