From b2217873d7b3ce2960d471fa05ee737c5080af33 Mon Sep 17 00:00:00 2001
From: Boulay Mathias <mathiasboulay@free.fr>
Date: Thu, 4 May 2023 12:38:31 +0200
Subject: [PATCH] Feat: Reduce JRE 8 size by around 3 MB (#15)

* Feat: trim .so files

* Build: update ndk version

* workaround, Switch to old strip bins

* Fix:typo
---
 ci_build_arch_aarch32.sh | 1 +
 ci_build_arch_aarch64.sh | 1 +
 ci_build_arch_x86.sh     | 1 +
 ci_build_arch_x86_64.sh  | 1 +
 tarjdk.sh                | 4 ++++
 5 files changed, 8 insertions(+)

diff --git a/ci_build_arch_aarch32.sh b/ci_build_arch_aarch32.sh
index 9729f93..5042501 100755
--- a/ci_build_arch_aarch32.sh
+++ b/ci_build_arch_aarch32.sh
@@ -3,6 +3,7 @@ set -e
 
 export TARGET=arm-linux-androideabi
 export TARGET_JDK=arm
+export NDK_PREBUILT_ARCH=/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/arm-linux-androideabi/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_arch_aarch64.sh b/ci_build_arch_aarch64.sh
index a75bd21..7092868 100755
--- a/ci_build_arch_aarch64.sh
+++ b/ci_build_arch_aarch64.sh
@@ -6,6 +6,7 @@ else
   export TARGET=aarch64-linux-android
 fi
 export TARGET_JDK=aarch64
+export NDK_PREBUILT_ARCH=/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/aarch64-linux-android/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_arch_x86.sh b/ci_build_arch_x86.sh
index 43c9a76..8956182 100755
--- a/ci_build_arch_x86.sh
+++ b/ci_build_arch_x86.sh
@@ -3,6 +3,7 @@ set -e
 
 export TARGET=i686-linux-android
 export TARGET_JDK=x86
+export NDK_PREBUILT_ARCH=/toolchains/x86-4.9/prebuilt/linux-x86_64/i686-linux-android/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/ci_build_arch_x86_64.sh b/ci_build_arch_x86_64.sh
index 52c93c4..8403148 100755
--- a/ci_build_arch_x86_64.sh
+++ b/ci_build_arch_x86_64.sh
@@ -3,6 +3,7 @@ set -e
 
 export TARGET=x86_64-linux-android
 export TARGET_JDK=x86_64
+export NDK_PREBUILT_ARCH=/toolchains/x86_64-4.9/prebuilt/linux-x86_64/x86_64-linux-android/bin/strip
 
 bash ci_build_global.sh
 
diff --git a/tarjdk.sh b/tarjdk.sh
index 3bff09b..d729fa4 100755
--- a/tarjdk.sh
+++ b/tarjdk.sh
@@ -30,6 +30,10 @@ sudo cp -R jre_override/lib/* jreout/lib/
 sudo cp -R jre_override/lib/* jdkout/jre/lib
 
 cd jreout
+
+# Strip in place all .so files thanks to the ndk
+find ./ -name '*.so' -execdir ${NDK}${NDK_PREBUILT_ARCH} {} \;
+
 tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
 
 cd ../jdkout