diff --git a/README.md b/README.md index 4b81d93..004aa33 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,8 @@ Based on http://openjdk.java.net/projects/mobile/android.html ### Run in this directory: ``` -export JDK_DEBUG_LEVEL=[release/fastdebug/debug] +export BUILD_FREETYPE_VERSION=[2.6.2/.../2.10.0] # default: 2.10.0 +export JDK_DEBUG_LEVEL=[release/fastdebug/debug] # default: 2.10.0 ./extractndk.sh ./getlibs.sh ./maketoolchain.sh diff --git a/buildjdk.sh b/buildjdk.sh index f8d8fee..8d51b07 100755 --- a/buildjdk.sh +++ b/buildjdk.sh @@ -1,7 +1,10 @@ #!/bin/bash set -e . setdevkitpath.sh -export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-${TARGET_SHORT} + +sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev + +export FREETYPE_DIR=`pwd`/freetype-$BUILD_FREETYPE_VERSION/build_android-${TARGET_SHORT} export CUPS_DIR=`pwd`/cups-2.2.4 # simplest to force headless:) diff --git a/buildlibs.sh b/buildlibs.sh index 9f2a07f..89345cb 100755 --- a/buildlibs.sh +++ b/buildlibs.sh @@ -5,7 +5,7 @@ export PATH=$TOOLCHAIN/bin:$PATH echo "Building Freetype" -cd freetype-2.6.2 +cd freetype-$BUILD_FREETYPE_VERSION ./configure \ --host=$TARGET \ --prefix=`pwd`/build_android-${TARGET_SHORT} \ @@ -19,8 +19,6 @@ if [ "$error_code" -ne 0 ]; then exit $error_code fi -CFLAGS=-fno-rtti CXXFLAGS=-fno-rtti make -j4 | \ -sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev - +CFLAGS=-fno-rtti CXXFLAGS=-fno-rtti make -j4 make install diff --git a/getlibs.sh b/getlibs.sh index bf431f8..286d6c7 100755 --- a/getlibs.sh +++ b/getlibs.sh @@ -1,8 +1,7 @@ #!/bin/sh # https://github.com/termux/termux-packages/blob/master/disabled-packages/openjdk-9-jre-headless/build.sh set -e -wget -O freetype-2.6.2.tar.bz2 https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2 -tar xf freetype-2.6.2.tar.bz2 -mv freetype-2.10.0 freetype-2.6.2 +wget https://download.savannah.gnu.org/releases/freetype/freetype-$BUILD_FREETYPE_VERSION.tar.bz2 +tar xf freetype-$BUILD_FREETYPE_VERSION.tar.bz2 wget https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz tar xf cups-2.2.4-source.tar.gz diff --git a/makejdkwithoutconfigure.sh b/makejdkwithoutconfigure.sh index 8b56457..1075390 100755 --- a/makejdkwithoutconfigure.sh +++ b/makejdkwithoutconfigure.sh @@ -3,7 +3,7 @@ set -e . setdevkitpath.sh -export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-${TARGET_SHORT} +export FREETYPE_DIR=`pwd`/freetype-${BUILD_FREETYPE_VERSION}/build_android-${TARGET_SHORT} export CUPS_DIR=`pwd`/cups-2.2.4 cd openjdk diff --git a/setdevkitpath.sh b/setdevkitpath.sh index 95ebb01..9fabc5a 100644 --- a/setdevkitpath.sh +++ b/setdevkitpath.sh @@ -2,6 +2,11 @@ # https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u/blob/aarch64-shenandoah-jdk8u272-b10/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c export NDK_VERSION=r10e +if [ -z "$BUILD_FREETYPE_VERSION" ] +then + export BUILD_FREETYPE_VERSION="2.10.0" +fi + if [ -z "$JDK_DEBUG_LEVEL" ] then export JDK_DEBUG_LEVEL=release