diff --git a/android/darwin-build-arm64-qt515.sh b/android/darwin-build-arm64-qt515.sh deleted file mode 100755 index ade5b89b..00000000 --- a/android/darwin-build-arm64-qt515.sh +++ /dev/null @@ -1,45 +0,0 @@ -BUILD_DIR=build-arm64-nougat -rm -rf $BUILD_DIR/* -mkdir -p $BUILD_DIR - -export PLATFORM_LEVEL=29 -export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/ -export ANDROID_SDK=/Users/Shared/Android/Sdk -export ANDROID_NDK=/Users/Shared/Android/Sdk/ndk/21.4.7075529 -export ANDROID_NATIVE_API_LEVEL=24 -export ANDROID_SDK_MINVER=24 -export ANDROID_SDK_TARGET=26 -export QT_DIR=/Users/Shared/Qt/5.15.2/android - -cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \ --DCMAKE_PREFIX_PATH=$QT_DIR \ --DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \ --DCMAKE_MAKE_PROGRAM=$ANDROID_NDK/prebuilt/darwin-x86_64/bin/make \ --DCMAKE_BUILD_TYPE=Release \ --DANDROID_ABI="arm64-v8a" \ --DANDROID_STL_PREFIX="llvm-libc++" \ --DANDROID_STL_SHARED_LIBRARIES="c++_shared" \ --DANDROID_SDK_MINVER=$ANDROID_SDK_MINVER \ --DANDROID_SDK_TARGET=$ANDROID_SDK_TARGET \ --DANDROID_NATIVE_API_LEVEL=$ANDROID_NATIVE_API_LEVEL \ --DQT_ANDROID_PLATFORM_LEVEL=$PLATFORM_LEVEL \ --DQT_ANDROID_TOOL_PREFIX="aarch64-linux-android" \ --DQT_ANDROID_SDK_ROOT=$ANDROID_SDK \ --DQT_ANDROID_NDK_ROOT=$ANDROID_NDK \ --DQT_ANDROID_QT_ROOT=$QT_DIR \ --DQT_ANDROID_SDK_BUILDTOOLS_REVISION="28.0.3" \ --DQt5_DIR=$QT_DIR/lib/cmake/Qt5 \ --DQt5Core_DIR=$QT_DIR/lib/cmake/Qt5Core \ --DQt5Gui_DIR=$QT_DIR/lib/cmake/Qt5Gui \ --DQt5Qml_DIR=$QT_DIR/lib/cmake/Qt5Qml \ --DQt5Network_DIR=$QT_DIR/lib/cmake/Qt5Network \ --DQt5Quick_DIR=$QT_DIR/lib/cmake/Qt5Quick \ --DQt5QuickControls2_DIR=$QT_DIR/lib/cmake/Qt5QuickControls2 \ --DQt5Xml_DIR=$QT_DIR/lib/cmake/Qt5Xml \ --DQt5Svg_DIR=$QT_DIR/lib/cmake/Qt5Svg \ --DQt5Widgets_DIR=$QT_DIR/lib/cmake/Qt5Widgets \ --DQt5QmlModels_DIR=$QT_DIR/lib/cmake/Qt5QmlModels \ -$@ - -[ $? -eq 0 ] && cmake --build $BUILD_DIR --parallel 4 - diff --git a/android/linux-build-arm64-qt515.sh b/android/linux-build-arm64-qt515.sh index 6df2992e..398bf2a8 100755 --- a/android/linux-build-arm64-qt515.sh +++ b/android/linux-build-arm64-qt515.sh @@ -2,10 +2,10 @@ BUILD_DIR=build-x64 rm -rf $BUILD_DIR/* mkdir -p $BUILD_DIR -export JAVA_HOME=$HOME/bin/java/jdk-17.0.12 +export JAVA_HOME=$HOME/bin/java/jdk1.8.0 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670 -export QT_DIR=$HOME/bin/Qt/5.15.15/android +export QT_DIR=$HOME/bin/Qt/5.15.2/android cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_PREFIX_PATH=$QT_DIR \ diff --git a/android/linux-build-armv7-qt515.sh b/android/linux-build-armv7-qt515.sh index cf7ac645..7bad2a50 100755 --- a/android/linux-build-armv7-qt515.sh +++ b/android/linux-build-armv7-qt515.sh @@ -2,10 +2,10 @@ BUILD_DIR=build-x64 rm -rf $BUILD_DIR/* mkdir -p $BUILD_DIR -export JAVA_HOME=$HOME/bin/java/jdk-17.0.12 +export JAVA_HOME=$HOME/bin/java/jdk1.8.0 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670 -export QT_DIR=$HOME/bin/Qt/5.15.15/android +export QT_DIR=$HOME/bin/Qt/5.15.2/android cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_PREFIX_PATH=$QT_DIR \ diff --git a/android/linux-build-x64-qt515.sh b/android/linux-build-x64-qt515.sh index cf893c36..24a2d60c 100755 --- a/android/linux-build-x64-qt515.sh +++ b/android/linux-build-x64-qt515.sh @@ -2,10 +2,10 @@ BUILD_DIR=build-x64 rm -rf $BUILD_DIR/* mkdir -p $BUILD_DIR -export JAVA_HOME=$HOME/bin/java/jdk-17.0.12 +export JAVA_HOME=$HOME/bin/java/jdk1.8.0 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670 -export QT_DIR=$HOME/bin/Qt/5.15.15/android +export QT_DIR=$HOME/bin/Qt/5.15.2/android cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_PREFIX_PATH=$QT_DIR \ diff --git a/android/linux-build-x86-qt515.sh b/android/linux-build-x86-qt515.sh index 7461ed40..655b514d 100755 --- a/android/linux-build-x86-qt515.sh +++ b/android/linux-build-x86-qt515.sh @@ -2,10 +2,10 @@ BUILD_DIR=build-x86 rm -rf $BUILD_DIR/* mkdir -p $BUILD_DIR -export JAVA_HOME=$HOME/bin/java/jdk-17.0.12 +export JAVA_HOME=$HOME/bin/java/jdk1.8.0 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670 -export QT_DIR=$HOME/bin/Qt/5.15.15/android +export QT_DIR=$HOME/bin/Qt/5.15.2/android cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_PREFIX_PATH=$QT_DIR \