Skip to content

Commit

Permalink
Fix jre21 build for Android x86 (#23)
Browse files Browse the repository at this point in the history
* Update tarjdk.sh

* Update buildjdk.sh

* Update clonejdk.sh

* Update build.yml

* Update buildjdk.sh

* Update buildjdk.sh
  • Loading branch information
Tungstend authored Mar 9, 2024
1 parent c0aba82 commit 8c59795
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build OpenJDK 17 for Android and iOS
name: Build OpenJDK 21 for Android and iOS

on:
push:
Expand Down
1 change: 1 addition & 0 deletions buildjdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ if [ "$BUILD_IOS" != "1" ]; then
platform_args="--with-toolchain-type=gcc \
--with-freetype-include=$FREETYPE_DIR/include/freetype2 \
--with-freetype-lib=$FREETYPE_DIR/lib \
--build=x86_64-unknown-linux-gnu \
"
AUTOCONF_x11arg="--x-includes=$ANDROID_INCLUDE/X11"
AUTOCONF_EXTRA_ARGS+="OBJCOPY=$OBJCOPY \
Expand Down
2 changes: 1 addition & 1 deletion clonejdk.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -e

git clone --depth 1 https://github.com/openjdk/jdk21u openjdk
git clone --branch jdk21.0.1 --depth 1 https://github.com/openjdk/jdk21u openjdk
2 changes: 1 addition & 1 deletion tarjdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
if [ "$BUILD_IOS" != "1" ]; then

unset AR AS CC CXX LD OBJCOPY RANLIB STRIP CPPFLAGS LDFLAGS
git clone https://github.com/termux/termux-elf-cleaner || true
git clone --depth 1 -b 'v2.2.0' https://github.com/termux/termux-elf-cleaner || true
cd termux-elf-cleaner
autoreconf --install
bash configure
Expand Down

0 comments on commit 8c59795

Please sign in to comment.