commit 607d4df2e2c6c2b8bec5763113d185783475f6f4
author Juan Yescas <jyescas@google.com> Mon Aug 28 16:40:02 2023 -0700
committer Juan Yescas <jyescas@google.com> Tue Aug 29 09:19:37 2023 -0700
tree e5f354473d6e225db202cd17896d7987f43f2c6e
parent 035f8d302af88ae2d866c84f5a1528e098e3d1a0

ziparchive: Use getpagesize() instead of a hardcoded value

Android V will support page size agnostic targets. For
ziparchive, getpagesize() will be used instead of the
hardcoded value for page size.

Bug: 281600291
Test: source build/envsetup.sh
      lunch aosp_cf_arm64_phone_pgagnostic
      m
Change-Id: Ib00afdb30fa363219a9184cfd9a6eff53d15f78b

zip_archive.cc

diff --git a/zip_archive.cc b/zip_archive.cc
index 0dcee63..5217123 100644
--- a/zip_archive.cc
+++ b/zip_archive.cc
@@ -97,13 +97,17 @@
  * of the string length into the hash table entry.
  */
 
-constexpr auto kPageSize = 4096;
+#ifdef __linux__
+static const size_t kPageSize = getpagesize();
+#else
+constexpr size_t kPageSize = 4096;
+#endif
 
-[[maybe_unused]] static constexpr uintptr_t pageAlignDown(uintptr_t ptr_int) {
+[[maybe_unused]] static uintptr_t pageAlignDown(uintptr_t ptr_int) {
   return ptr_int & ~(kPageSize - 1);
 }
 
-[[maybe_unused]] static constexpr uintptr_t pageAlignUp(uintptr_t ptr_int) {
+[[maybe_unused]] static uintptr_t pageAlignUp(uintptr_t ptr_int) {
   return pageAlignDown(ptr_int + kPageSize - 1);
 }