From 2fbae3c5125323fa71c60f87c465e90c44c9f46e Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 19 Aug 2020 01:11:04 +0200 Subject: [PATCH] Update linux.sh --- travis/linux.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/travis/linux.sh b/travis/linux.sh index 1820d84..edd26f8 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -21,14 +21,14 @@ mkdir $TD_BUILD_DIR || true mkdir $TDNATIVES_CPP_BUILD_DIR || true # Install java and fix java paths -if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then - export TRAVIS_CPU_ARCH_STANDARD="aarch64" +if [ "$TRAVIS_CPU_ARCH" = "aarch64" ]; then + export TRAVIS_CPU_ARCH_JAVA="arm64" else - export TRAVIS_CPU_ARCH_STANDARD="${TRAVIS_CPU_ARCH,,}" + export TRAVIS_CPU_ARCH_JAVA="${TRAVIS_CPU_ARCH,,}" fi -export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_STANDARD/bin" -export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_STANDARD" -export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_STANDARD/include" +export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/bin" +export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA" +export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/include" echo "PATH=${PATH}" echo "JAVA_HOME=${JAVA_HOME}"