TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-11 05:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge buildjre17-patch into buildjre17

Browse Source
This commit is contained in:
Duy Tran Khanh 2023-02-27 07:20:48 +07:00 committed by GitHub
commit 39be5d5b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5838 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-wrapped-clang
View File

@ -5,6 +5,6 @@ if [ "$1" = "--version" ]; then
echo "This is free software; see the source for copying conditions. There is NO" echo "This is free software; see the source for copying conditions. There is NO"
echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
else else
exec $thecc "${@/-fno-var-tracking-assignments/}" exec $thecc -Wno-unknown-warning-option "${@/-fno-var-tracking-assignments/}"
# exec $thecc "$theargs" # exec $thecc "$theargs"
fi fi

2
android-wrapped-clang++
View File

@ -6,6 +6,6 @@ if [ "$1" = "--version" ]; then
echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
else else
# theargs= # theargs=
exec $thecxx "${@/-fno-var-tracking-assignments/}" exec $thecxx -Wno-unknown-warning-option "${@/-fno-var-tracking-assignments/}"
# exec $thecxx "$theargs" # exec $thecxx "$theargs"
fi fi

15
buildjdk.sh
View File

@ -70,6 +70,21 @@ fi
ln -s -f $CUPS_DIR/cups $ANDROID_INCLUDE/ ln -s -f $CUPS_DIR/cups $ANDROID_INCLUDE/
cd openjdk cd openjdk
# Apply patches
git reset --hard
if [ "$BUILD_IOS" != "1" ]; then
git apply --reject --whitespace=fix ../patches/jdk17u_android.diff || echo "git apply failed (Android patch set)"
else
git apply --reject --whitespace=fix ../patches/jdk17u_ios.diff || echo "git apply failed (iOS patch set)"
# Hack: exclude building macOS stuff
desktop_mac=src/java.desktop/macosx
mv ${desktop_mac} ${desktop_mac}_NOTIOS
mkdir -p ${desktop_mac}/native
mv ${desktop_mac}_NOTIOS/native/libjsound ${desktop_mac}/native/
fi
# rm -rf build # rm -rf build
# --with-extra-cxxflags="$CXXFLAGS -Dchar16_t=uint16_t -Dchar32_t=uint32_t" \ # --with-extra-cxxflags="$CXXFLAGS -Dchar16_t=uint16_t -Dchar32_t=uint32_t" \

12
clonejdk.sh
View File

@ -1,14 +1,4 @@
#!/bin/bash #!/bin/bash
set -e set -e
# TODO: use jdk17u repo for building for Android git clone --depth 1 https://github.com/openjdk/jdk17u openjdk
if [ "$BUILD_IOS" != "1" ]; then
git clone --depth 1 https://github.com/PojavLauncherTeam/mobile openjdk
else
git clone --depth 1 https://github.com/PojavLauncherTeam/jdk17u openjdk
# Hack: exclude building macOS stuff
desktop_mac=openjdk/src/java.desktop/macosx
mv ${desktop_mac} ${desktop_mac}_NOTIOS
mkdir -p ${desktop_mac}/native
mv ${desktop_mac}_NOTIOS/native/libjsound ${desktop_mac}/native/
fi

2511
patches/jdk17u_android.diff Normal file
View File

File diff suppressed because it is too large Load Diff

3309
patches/jdk17u_ios.diff Normal file
View File

File diff suppressed because it is too large Load Diff