From 5023455cb20f1f77b244876a97bdafdce83485ff Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@eyecreate.org>
Date: Thu, 25 Jun 2020 21:22:07 -0400
Subject: [PATCH] fix android builds by building kirigami and removing manifest
 feature.

---
 android-build.sh                      | 29 +--------------------------
 packaging/android/AndroidManifest.xml |  2 +-
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/android-build.sh b/android-build.sh
index be2e470..7cb7c7e 100644
--- a/android-build.sh
+++ b/android-build.sh
@@ -1,31 +1,4 @@
 #!/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"
+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 kcoreaddons Frameworks -DBUILD_TESTING=OFF; /opt/helpers/build-kde-project kirigami 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/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index dc9e3dd..d7119f7 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -14,7 +14,7 @@
 
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Vehicle Voyage" android:extractNativeLibs="true" android:icon="@drawable/logo">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Vehicle Voyage"  android:icon="@drawable/logo">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
                   android:label="Vehicle Voyage"