eyecreate/vehicle-voyage
Public Access
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes to code and major testing of ways to build for android.

Browse Source
This commit is contained in:
Kevin Whitaker
2020-06-25 19:21:06 -04:00
parent fe58b7ce2f
commit fe16401687
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -14,7 +14,7 @@ include(FeatureSummary)
################# set KDE specific information ################# ################# 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 # 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}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

36
android-build.sh
View File

@@ -1,5 +1,31 @@
#!/bin/sh #!/bin/bash
mkdir -p `dirname "$0"`/android-build <<COMMENT
cd `dirname "$0"`/android-build ROOT_DIR=`dirname "$0"`
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 .. if [ "$ARCH" == "arm" ]
make create-apk-vehiclevoyage 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"

2
src/main.cpp
View File

@@ -35,7 +35,9 @@
Q_DECL_EXPORT int main(int argc, char *argv[]) Q_DECL_EXPORT int main(int argc, char *argv[])
{ {
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication app(argc, argv); QApplication app(argc, argv);
KAboutData aboutData("org.eyecreate.vehiclevoyage", "Vehicle Voyage", "1.0", "Track vehicle service history.",KAboutLicense::GPL_V3);//TODO:i18n KAboutData aboutData("org.eyecreate.vehiclevoyage", "Vehicle Voyage", "1.0", "Track vehicle service history.",KAboutLicense::GPL_V3);//TODO:i18n
aboutData.setProductName("vehiclevoyage"); aboutData.setProductName("vehiclevoyage");