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

[aarch32] Fix JVM variants

Browse Source
This commit is contained in:
Duy Tran Khanh 2021-01-23 06:23:32 +07:00
parent cbc60b4c77
commit 04f901448c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -47,7 +47,7 @@ Based on http://openjdk.java.net/projects/mobile/android.html
``` ```
export BUILD_FREETYPE_VERSION=[2.6.2/.../2.10.0] # default: 2.10.0 export BUILD_FREETYPE_VERSION=[2.6.2/.../2.10.0] # default: 2.10.0
export JDK_DEBUG_LEVEL=[release/fastdebug/debug] # default: release export JDK_DEBUG_LEVEL=[release/fastdebug/debug] # default: release
export JDK_VARIANT=[client/server] # default: client (aarch32), server (other architectures) export JVM_VARIANTS=[client/server] # default: client (aarch32), server (other architectures)
./extractndk.sh ./extractndk.sh
./getlibs.sh ./getlibs.sh
./maketoolchain.sh ./maketoolchain.sh

14
buildjdk.sh
View File

@ -5,14 +5,14 @@ set -e
if [ "$TARGET_JDK" == "arm" ] if [ "$TARGET_JDK" == "arm" ]
then then
export TARGET_JDK=aarch32 export TARGET_JDK=aarch32
if [ -z "$JDK_VARIANT"] if [ -z "$JVM_VARIANTS"]
then then
export JDK_VARIANT=client export JVM_VARIANTS=client
fi fi
else else
if [ -z "$JDK_VARIANT"] if [ -z "$JVM_VARIANTS"]
then then
export JDK_VARIANT=server export JVM_VARIANTS=server
fi fi
fi fi
@ -52,7 +52,7 @@ bash ./configure \
--enable-option-checking=fatal \ --enable-option-checking=fatal \
--openjdk-target=$TARGET \ --openjdk-target=$TARGET \
--with-jdk-variant=normal \ --with-jdk-variant=normal \
--with-jvm-variants=$JDK_VARIANT \ --with-jvm-variants=$JVM_VARIANTS \
--with-cups-include=$CUPS_DIR \ --with-cups-include=$CUPS_DIR \
--with-devkit=$TOOLCHAIN \ --with-devkit=$TOOLCHAIN \
--with-debug-level=$JDK_DEBUG_LEVEL \ --with-debug-level=$JDK_DEBUG_LEVEL \
@ -68,8 +68,8 @@ if [ "$error_code" -ne 0 ]; then
exit $error_code exit $error_code
fi fi
# mkdir -p build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL} # mkdir -p build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}
cd build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL} cd build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}
make JOBS=4 images || \ make JOBS=4 images || \
error_code=$? error_code=$?
if [ "$error_code" -ne 0 ]; then if [ "$error_code" -ne 0 ]; then

2
makejdkwithoutconfigure.sh
View File

@ -7,5 +7,5 @@ export FREETYPE_DIR=`pwd`/freetype-${BUILD_FREETYPE_VERSION}/build_android-${TAR
export CUPS_DIR=`pwd`/cups-2.2.4 export CUPS_DIR=`pwd`/cups-2.2.4
cd openjdk cd openjdk
cd build/linux-${TARGET_JDK}-normal-server-release cd build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-release
make JOBS=4 images make JOBS=4 images

2
removejdkdebuginfo.sh
View File

@ -2,7 +2,7 @@
set -e set -e
rm -rf jreout || true rm -rf jreout || true
cp -r openjdk/build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL}/images/j2re-image jreout cp -r openjdk/build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images/j2re-image jreout
mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?" mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?"
# mv jreout/lib/${TARGET_JDK}/libfontmanager.diz jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep # mv jreout/lib/${TARGET_JDK}/libfontmanager.diz jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep