tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Use correct java installation directory

Browse Source
This commit is contained in:
Andrea Cavalli 2021-09-26 00:19:07 +02:00
parent 2aeb8703e3
commit 33329cac06
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/core/install-dependencies.sh
View File

@ -150,8 +150,8 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
#echo "SET(JAVA_HOME \"$CROSS_OPENJDK_PATH\")"; #echo "SET(JAVA_HOME \"$CROSS_OPENJDK_PATH\")";
#echo "SET(JAVA_INCLUDE_PATH \"$CROSS_OPENJDK_PATH/include\")"; #echo "SET(JAVA_INCLUDE_PATH \"$CROSS_OPENJDK_PATH/include\")";
#echo "SET(JAVA_INCLUDE_PATH2 \"$CROSS_OPENJDK_PATH/include/linux\")"; #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_JVM_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${JAVA_INSTALLATION_TYPE}/libjvm.so\")";
echo "SET(JAVA_AWT_LIBRARY \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/libawt.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(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_JAR_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/java\")";
#echo "SET(Java_JAVAC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javac\")"; #echo "SET(Java_JAVAC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javac\")";

2
scripts/core/setup-variables.sh
View File

@ -21,7 +21,7 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
elif [[ "$CPU_ARCHITECTURE_NAME" == "armhf" ]]; then elif [[ "$CPU_ARCHITECTURE_NAME" == "armhf" ]]; then
export CPU_ARCH_JAVA="armhf" export CPU_ARCH_JAVA="armhf"
export CPU_ARCH_JAVA_INTERNAL="arm" export CPU_ARCH_JAVA_INTERNAL="arm"
export JAVA_INSTALLATION_TYPE="client" export JAVA_INSTALLATION_TYPE="server"
export CPU_ARCH_DPKG="armhf" export CPU_ARCH_DPKG="armhf"
export CPU_ARCH_CMAKE="arm" export CPU_ARCH_CMAKE="arm"
export CPU_ARCH_LINUX="arm" export CPU_ARCH_LINUX="arm"