From 00df3fc8ed93053d79fe678eec1e79f20026cb51 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Wed, 28 Aug 2019 13:16:55 -0700
Subject: [PATCH] Depend on 32/64 apk naming from build

---
 .travis.yml      |  1 -
 QGCInstaller.pri | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 88fea3f83..e0dd6c308 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -189,7 +189,6 @@ after_success:
         pip install --user --upgrade oauth2client &&
         pip install --user google-api-python-client pyopenssl ndg-httpsclient pyasn1 &&
         openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d &&
-        cp ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk ${SHADOW_BUILD_DIR}/release/package/QGroundControl${BITNESS}.apk
         ./tools/google_play_upload.py production ${GOOGLE_PLAY_PKG} ${SHADOW_BUILD_DIR}/release/package/QGroundControl${BITNESS}.apk;
     fi
 
diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index 1e6bfe9fd..2432ca19a 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -52,10 +52,16 @@ installer {
         QMAKE_POST_LINK += && tar --warning=no-file-changed -cjf release/package/QGroundControl.tar.bz2 release --exclude='package' --transform 's/release/qgroundcontrol/'
     }
     AndroidBuild {
-        #-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
         QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
         QMAKE_POST_LINK += && make install INSTALL_ROOT=$${DESTDIR}/android-build/
         QMAKE_POST_LINK += && androiddeployqt --input android-libQGroundControl.so-deployment-settings.json --output $${DESTDIR}/android-build --deployment bundled --gradle --sign $${BASEDIR}/android/android_release.keystore dagar --storepass $$(ANDROID_STOREPASS)
-        QMAKE_POST_LINK += && cp $${DESTDIR}/android-build/build/outputs/apk/android-build-release-signed.apk $${DESTDIR}/package/QGroundControl.apk
+        contains(QT_ARCH, arm) {
+            QGC_APK_BITNESS = "32"
+        } else:contains(QT_ARCH, arm64) {
+            QGC_APK_BITNESS = "64"
+        } else {
+            QGC_APK_BITNESS = ""
+        }
+        QMAKE_POST_LINK += && cp $${DESTDIR}/android-build/build/outputs/apk/android-build-release-signed.apk $${DESTDIR}/package/QGroundControl$${QGC_APK_BITNESS}.apk
     }
 }
-- 
2.22.0