From fe16401687700accc6beef75127839fec50b4233 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@pop-os.localdomain>
Date: Thu, 25 Jun 2020 19:21:06 -0400
Subject: [PATCH] minor changes to code and major testing of ways to build for
 android.

---
 CMakeLists.txt   |  2 +-
 android-build.sh | 36 +++++++++++++++++++++++++++++++-----
 src/main.cpp     |  2 ++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c42f22a..c18b667 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ include(FeatureSummary)
 
 ################# set KDE specific information #################
 
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/android-build.sh b/android-build.sh
index d8f6734..be2e470 100644
--- a/android-build.sh
+++ b/android-build.sh
@@ -1,5 +1,31 @@
-#!/bin/sh
-mkdir -p `dirname "$0"`/android-build
-cd `dirname "$0"`/android-build
-cmake -DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-arm/share/ECM/toolchain/Android.cmake -DECM_DIR="/opt/kdeandroid-arm/share/EMC/cmake" -DECM_ADDITIONAL_FIND_ROOT_PATH="/opt/Qt;/opt/kdeandroid-arm/" -DCMAKE_BUILD_TYPE=Release -DQTANDROID_EXPORTED_TARGET=vehiclevoyage -DANDROID_APK_DIR=../packaging/android -DKF5_HOST_TOOLING=/opt/nativetooling/lib/x86_64-linux-gnu/cmake/ -DCMAKE_INSTALL_PREFIX=/home/user/build-arm ..
-make create-apk-vehiclevoyage
+#!/bin/bash
+<<COMMENT
+ROOT_DIR=`dirname "$0"`
+if [ "$ARCH" == "arm" ]
+then
+mkdir -p $ROOT_DIR/android-build-arm
+cd $ROOT_DIR/android-build-arm
+export ANDROID_ARCH=arm
+export ANDROID_ARCH_ABI=armeabi-v7a
+cmake -DCMAKE_INSTALL_PREFIX=/home/user/build-arm -DCMAKE_PREFIX_PATH="$QT_PATH;/opt/kdeandroid-arm/" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake -DQTANDROID_EXPORTED_TARGET=vehiclevoyage -DCMAKE_ANDROID_API=android-28 -DANDROID_API_LEVEL=28 -DANDROID_APK_DIR=../packaging/android -DKF5_HOST_TOOLING=/opt/nativetooling/lib/x86_64-linux-gnu/cmake/ ..
+make install
+make create-apk
+fi
+if [ "$ARCH" == "arm64" ]
+then
+mkdir -p $ROOT_DIR/android-build-aarch64
+cd $ROOT_DIR/android-build-aarch64
+export ANDROID_ARCH=arm64
+export ANDROID_ARCH_ABI=arm64-v8a
+cmake -DCMAKE_INSTALL_PREFIX=/home/user/build-arm64 -DCMAKE_PREFIX_PATH="$QT_PATH;/opt/kdeandroid-arm64/" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake -DQTANDROID_EXPORTED_TARGET=vehiclevoyage -DCMAKE_ANDROID_API=android-28 -DANDROID_API_LEVEL=28 -DANDROID_APK_DIR=../packaging/android -DKF5_HOST_TOOLING=/opt/nativetooling/lib/x86_64-linux-gnu/cmake/ ..
+make install
+make create-apk
+fi
+if [ -z $ARCH ]
+then
+echo "Need ARCH set to arm or arm64 build."
+fi
+COMMENT
+ROOT_DIR=$(dirname $(realpath -s $0))
+mkdir -p $ROOT_DIR/builds
+docker run --rm -it -v $ROOT_DIR:/home/user/src/vv kdeorg/android-sdk bash -c "git clone --depth 1 kde:sysadmin/ci-tooling;/opt/helpers/build-kde-project kirigami Frameworks -DBUILD_TESTING=OFF; /opt/helpers/build-kde-project kcoreaddons Frameworks -DBUILD_TESTING=OFF;/opt/helpers/build-cmake vv vv -DQTANDROID_EXPORTED_TARGET=vehiclevoyage -DANDROID_APK_DIR=/home/user/src/vv/packaging/android -DANDROID_APK_OUTPUT_DIR=/home/user/src/vv/builds;make -C /home/user/build-arm/vv create-apk;make -C /home/user/build-arm64/vv create-apk"
diff --git a/src/main.cpp b/src/main.cpp
index 1283dc9..afceb07 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,7 +35,9 @@
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     QApplication app(argc, argv);
+
     
     KAboutData aboutData("org.eyecreate.vehiclevoyage", "Vehicle Voyage", "1.0", "Track vehicle service history.",KAboutLicense::GPL_V3);//TODO:i18n
     aboutData.setProductName("vehiclevoyage");
-- 
GitLab