commit a6281febbf3a7f48b8ebb5ea4f267479c01f3a31
author Juan Yescas <jyescas@google.com> Mon Sep 09 15:53:32 2024 -0700
committer Juan Yescas <jyescas@google.com> Mon Sep 09 15:53:32 2024 -0700
tree bddfb43ec34f41d41a1c7acc8683194805cea233
parent 50cd112f1bc39ba6939f108625b2d5cd22f3a21c

16kb: bionic: zipalign shared libraries to 16kb for bionic tests

In order for the test to pass in 16kb page size kernels, it is
necessary to zipalign shared libraries to 16kb.

With this change, the test cases from below passed in
4kb and 16kb kernels.

dl#exec_linker_load_from_zip
dlfcn#dlopen_from_zip_absolute_path
dlfcn#dlopen_from_zip_ld_library_path
DlExtTest#ExtInfoUseFdWithOffset
dlfcn#dlopen_from_zip_with_dt_runpath

Bug: 347728628
Test: m bionic-unit-tests
      atest bionic-unit-tests
Change-Id: I1ad070f8ba65111fab6a1361954efbf62a8ad19a

tests/libs/Android.bp

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index fc7fd40..35f0f0c 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -1852,7 +1852,7 @@
         " cp $(in) $(genDir)/zipdir/libdir/ &&" +
         " touch $(genDir)/zipdir/empty_file.txt &&" +
         " $(location soong_zip) -o $(out).unaligned -L 0 -C $(genDir)/zipdir -D $(genDir)/zipdir &&" +
-        " $(location bionic_tests_zipalign) 4096 $(out).unaligned $(out)",
+        " $(location bionic_tests_zipalign) 16384 $(out).unaligned $(out)",
 
 }
 
@@ -1891,5 +1891,5 @@
         " cp $(location :libtest_dt_runpath_y) $(genDir)/zipdir/libdir/dt_runpath_y/$$PRIVATE_LIB_OR_LIB64 &&" +
         " touch $(genDir)/zipdir/empty_file.txt &&" +
         " $(location soong_zip) -o $(out).unaligned -L 0 -C $(genDir)/zipdir -D $(genDir)/zipdir &&" +
-        " $(location bionic_tests_zipalign) 4096 $(out).unaligned $(out)",
+        " $(location bionic_tests_zipalign) 16384 $(out).unaligned $(out)",
 }