fix

Author: Tungstend

awt_xawt/libawt_xawt.so

@@ -8,6 +8,7 @@ export CFLAGS+=" -DLE_STANDALONE"
 if [[ "$TARGET_JDK" == "arm" ]]
 then
   export CFLAGS+=" -O3 -D__thumb__"
+  export CFLAGS+=" -Dfseeko=fseek -Dftello=ftell"
 else
   export CFLAGS+=" -O3"
 fi

build_jdk.sh

@@ -16,21 +16,24 @@ export EXTRA_JLINK_OPTION=
 
 if [[ "$TARGET_JDK" == "aarch64" ]] || [[ "$TARGET_JDK" == "x86_64" ]]; then
    echo "Building for aarch64 or x86_64, introducing JVMCI module"
-   export EXTRA_JLINK_OPTION=,jdk.internal.vm.ci
+   export EXTRA_JLINK_OPTION=,jdk.internal.vm.ci,jdk.internal.jvmstat,jdk.internal.ed,jdk.internal.le,jdk.internal.md,jdk.internal.opt
 fi
 
+export JLINK_STRIP_ARG="--strip-native-debug-symbols=exclude-debuginfo-files:objcopy=${OBJCOPY}"
+
 # Produce the jre equivalent from the jdk (https://blog.adoptium.net/2021/10/jlink-to-produce-own-runtime/)
 $targetpath/buildjdk/jdk/bin/jlink \
 --module-path=jdkout/jmods \
 --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.editpad,jdk.httpserver,jdk.jdwp.agent,jdk.jfr,jdk.jsobject,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.nio.mapmode,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.xml.dom,jdk.zipfs,jdk.hotspot.agent,jdk.incubator.vector$EXTRA_JLINK_OPTION \
 --output jreout \
---strip-debug \
+$JLINK_STRIP_ARG \
 --no-man-pages \
 --no-header-files \
 --release-info=jdkout/release \
 --compress=0
 
 cp freetype-$BUILD_FREETYPE_VERSION/build_android-$TARGET_SHORT/lib/libfreetype.so jreout/lib/
+cp awt_xawt/libawt_xawt.so jreout/lib/
 
 find jdkout -name "*.debuginfo" -exec mv {}   dizout/ \;
 

remove_jdk_debug_info.sh

@@ -3,12 +3,15 @@ set -e
 . set_devkit_path.sh
 
 unset AR AS CC CXX LD OBJCOPY RANLIB STRIP CPPFLAGS LDFLAGS
-git clone --depth 1 --branch 'v2.2.0' https://github.com/termux/termux-elf-cleaner || true
+git clone --depth 1 https://github.com/termux/termux-elf-cleaner || true
 cd termux-elf-cleaner
-autoreconf --install
-bash configure
-make CFLAGS=-D__ANDROID_API__=24
-cd ..
+mkdir build
+cd build
+export CFLAGS=-D__ANDROID_API__=${API}
+cmake ..
+make -j4
+unset CFLAGS
+cd ../..
 
 findexec() { find $1 -type f -name "*" -not -name "*.o" -exec sh -c '
     case "$(head -n 1 "$1")" in
@@ -20,14 +23,14 @@ exit 1
 ' sh {} \; -print
 }
 
-findexec jreout | xargs -- ./termux-elf-cleaner/termux-elf-cleaner
-findexec jdkout | xargs -- ./termux-elf-cleaner/termux-elf-cleaner
+findexec jreout | xargs ./termux-elf-cleaner/build/termux-elf-cleaner --api-level 24
+findexec jdkout | xargs ./termux-elf-cleaner/build/termux-elf-cleaner --api-level 24
 
 cp -rv jre_override/lib/* jreout/lib/ || true
 
 cd jreout
 
 # Strip in place all .so files thanks to the ndk
-find ./ -name '*.so' -execdir $NDK/toolchains/llvm/prebuilt/linux-x86_64/${NDK_PREBUILT_ARCH}-linux-android/bin/strip {} \;
+find ./ -name '*.so' -execdir $NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip {} \;
 
 tar cJf ../jre25-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .