From 8fead7b8eb78ee0f30ce153c1964003c6a04927e Mon Sep 17 00:00:00 2001
From: Steven Moreland <45954464+smore-lore@users.noreply.github.com>
Date: Fri, 16 Aug 2024 10:46:22 -0700
Subject: [PATCH 1/2] gradle: add max-page-size 16384

This uses Gradle 7, so must specify page size exactly, rather
than being able to use the newer options.

This may not update the APK alignment, but you can always run
zipalign to realign an unaligned APK. Or, if you pull the .so
directly it will work.
---
 android/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/build.gradle b/android/build.gradle
index e02dcfa32..0fc26e68f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -60,6 +60,7 @@ if (androidSdkInstalled) {
                             "-DBORINGSSL_HOME=$boringsslHome",
                             "-DCMAKE_CXX_STANDARD=17"
                     cFlags '-fvisibility=hidden',
+                            '-Wl,-z,max-page-size=16384',
                             '-DBORINGSSL_SHARED_LIBRARY',
                             '-DBORINGSSL_IMPLEMENTATION',
                             '-DOPENSSL_SMALL',

From 7f45a516983b5f901a02b45fdce46856cc658b0c Mon Sep 17 00:00:00 2001
From: Steven Moreland <45954464+smore-lore@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:33:21 -0700
Subject: [PATCH 2/2] Update build.gradle

---
 android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 0fc26e68f..758dd0087 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -60,12 +60,12 @@ if (androidSdkInstalled) {
                             "-DBORINGSSL_HOME=$boringsslHome",
                             "-DCMAKE_CXX_STANDARD=17"
                     cFlags '-fvisibility=hidden',
-                            '-Wl,-z,max-page-size=16384',
                             '-DBORINGSSL_SHARED_LIBRARY',
                             '-DBORINGSSL_IMPLEMENTATION',
                             '-DOPENSSL_SMALL',
                             '-D_XOPEN_SOURCE=700',
-                            '-Wno-unused-parameter'
+                            '-Wno-unused-parameter',
+                            '-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384'
                     targets 'conscrypt_jni'
                     version androidCmakeVersion
                 }