From 6434e847d4f7a1b7c6848845f16f66e21c9fa859 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 18 Aug 2020 22:30:02 +0200 Subject: [PATCH] Update linux.sh --- travis/linux.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/travis/linux.sh b/travis/linux.sh index 4d84bc4..6090de7 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -5,9 +5,15 @@ cd src/main/jni sudo apt install openjdk-11-jdk-headless -export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)/bin" -export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)" -export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)/include" +if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then + export TRAVIS_CPU_ARCH_STANDARD="aarch64" +else + export TRAVIS_CPU_ARCH_STANDARD="${TRAVIS_CPU_ARCH,,}" +fi +export TRAVIS_OS_NAME_STANDARD="${TRAVIS_OS_NAME,,}" +export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$TRAVIS_OS_NAME_STANDARD/bin" +export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_OS_NAME_STANDARD" +export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_OS_NAME_STANDARD/include" export TD_SRC_DIR=${PWD}/td export TD_BIN_DIR=${PWD}/jtdlib/td