From 7f3a786c333ffb1b0ef353553f962ac9f1e67c5b Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 31 Mar 2020 13:02:02 +0200
Subject: [PATCH] Add support for building .aab bundles

---
 libnymea-app/libnymea-app.pro                              | 5 +++++
 nymea-app/nymea-app.pro                                    | 2 ++
 packaging/android/build.gradle                             | 2 +-
 packaging/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libnymea-app/libnymea-app.pro b/libnymea-app/libnymea-app.pro
index 766c0b41..ee155727 100644
--- a/libnymea-app/libnymea-app.pro
+++ b/libnymea-app/libnymea-app.pro
@@ -283,3 +283,8 @@ HEADERS += \
 ubports: {
     DEFINES += UBPORTS
 }
+
+# https://bugreports.qt.io/browse/QTBUG-83165
+android: {
+    DESTDIR = $${ANDROID_TARGET_ARCH}
+}
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index 67bc711a..256f34c2 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -77,6 +77,8 @@ android {
         $$ANDROID_PACKAGE_SOURCE_DIR/src/io/guh/nymeaapp/NymeaAppNotificationService.java \
         $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
 
+    # https://bugreports.qt.io/browse/QTBUG-83165
+    LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
 }
 
 macx: {
diff --git a/packaging/android/build.gradle b/packaging/android/build.gradle
index 7c7c793a..347edce5 100644
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:3.2.0'
     }
 }
diff --git a/packaging/android/gradle/wrapper/gradle-wrapper.properties b/packaging/android/gradle/wrapper/gradle-wrapper.properties
index 649480dd..9cd76d83 100644
--- a/packaging/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packaging/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip