From 33329cac0675a64c117a664b0cf963be06a00bb3 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 26 Sep 2021 00:19:07 +0200 Subject: [PATCH] Use correct java installation directory --- scripts/core/install-dependencies.sh | 4 ++-- scripts/core/setup-variables.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/core/install-dependencies.sh b/scripts/core/install-dependencies.sh index c275691..38cdf6a 100755 --- a/scripts/core/install-dependencies.sh +++ b/scripts/core/install-dependencies.sh @@ -150,8 +150,8 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then #echo "SET(JAVA_HOME \"$CROSS_OPENJDK_PATH\")"; #echo "SET(JAVA_INCLUDE_PATH \"$CROSS_OPENJDK_PATH/include\")"; #echo "SET(JAVA_INCLUDE_PATH2 \"$CROSS_OPENJDK_PATH/include/linux\")"; - echo "SET(JAVA_JVM_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/${JAVA_INSTALLATION_TYPE}/libjvm.so\")"; - echo "SET(JAVA_AWT_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/libawt.so\")"; + echo "SET(JAVA_JVM_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${JAVA_INSTALLATION_TYPE}/libjvm.so\")"; + echo "SET(JAVA_AWT_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/libawt.so\")"; #echo "SET(JNI_INCLUDE_DIRS \"$CROSS_OPENJDK_PATH/include\" \"$CROSS_OPENJDK_PATH/include/linux\")"; #echo "SET(Java_JAR_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/java\")"; #echo "SET(Java_JAVAC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javac\")"; diff --git a/scripts/core/setup-variables.sh b/scripts/core/setup-variables.sh index 6ab9280..0b57997 100755 --- a/scripts/core/setup-variables.sh +++ b/scripts/core/setup-variables.sh @@ -21,7 +21,7 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then elif [[ "$CPU_ARCHITECTURE_NAME" == "armhf" ]]; then export CPU_ARCH_JAVA="armhf" export CPU_ARCH_JAVA_INTERNAL="arm" - export JAVA_INSTALLATION_TYPE="client" + export JAVA_INSTALLATION_TYPE="server" export CPU_ARCH_DPKG="armhf" export CPU_ARCH_CMAKE="arm" export CPU_ARCH_LINUX="arm"