From c155194545769b9dada9408116b3f72aa53f583f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 19 Aug 2019 06:27:34 +0200 Subject: Bug 1363: Java 11: Validated build on Java11 Note: On Windows w/ CMake 3.15.2 and MingW64 8.1.0 openal-soft still doesn't build through yet (no regression, didn't build before). I added the and had to replace \cygwin\bin\sh.exe with a symbolic link to \cygwin\bin\bash.exe to make it pass .. still WIP. Compilation setup also claimed DSOUND headers were n/a. --- make/scripts/make.joal.all.android-armv6-cross.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'make/scripts/make.joal.all.android-armv6-cross.sh') diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh index a7b3124..3a2e5cc 100755 --- a/make/scripts/make.joal.all.android-armv6-cross.sh +++ b/make/scripts/make.joal.all.android-armv6-cross.sh @@ -26,13 +26,12 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -export ANDROID_VERSION=9 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar -#export GCC_VERSION=4.4.3 -export GCC_VERSION=4.8 +export GCC_VERSION=4.9 export HOST_ARCH=linux-x86_64 export TARGET_TRIPLE=arm-linux-androideabi -- cgit v1.2.3