Update CMakeLists.txt and linux.sh

This commit is contained in:
Andrea Cavalli 2020-08-19 00:34:31 +02:00
parent 30f017c892
commit b7974cd1b5
2 changed files with 1 additions and 3 deletions

View File

@ -12,8 +12,6 @@ endif()
find_package(Td REQUIRED)
if (NOT JNI_FOUND)
set(JAVA_AWT_LIBRARY NotNeeded)
set(JAVA_AWT_INCLUDE_PATH NotNeeded)
find_package(JNI REQUIRED)
endif()
message(STATUS "Found JNI: ${JNI_INCLUDE_DIRS} ${JNI_LIBRARIES}")

View File

@ -21,7 +21,7 @@ mkdir $TD_BUILD_DIR || true
mkdir $TDNATIVES_CPP_BUILD_DIR || true
# Install java and fix java paths
sudo apt install --reinstall openjdk-11-jdk-headless
sudo apt install --reinstall openjdk-11-jdk -y
if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then
export TRAVIS_CPU_ARCH_STANDARD="aarch64"
else