From 55dffe09def8389b807c426c738a9550196dcb6d Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Wed, 28 Aug 2019 12:17:20 -0700
Subject: [PATCH] Support build/deploy both 32 and 64 bit builds

---
 .travis.yml                     | 11 ++++++++---
 tools/update_android_version.sh |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 920d3ce1b..b8058a011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,12 @@ matrix:
           sudo: required
         - dist: trusty
           language: android
-          env: SPEC=android-clang CONFIG=installer
+          env: SPEC=android-clang CONFIG=installer BITNESS=32
           sudo: false
+		- dist: trusty
+		  language: android
+		  env: SPEC=android-clang CONFIG=installer BITNESS=64
+		  sudo: false
         - os: osx
           osx_image: xcode9.2
           env: SPEC=macx-clang CONFIG=installer
@@ -141,7 +145,7 @@ before_script:
   - if [ "${SPEC}" = "android-clang" ]; then
         git remote set-branches origin 'master' &&
         git fetch --tags origin master &&
-        ./tools/update_android_version.sh;
+		./tools/update_android_version.sh ${BITNESS};
     fi
 
 script:
@@ -185,7 +189,8 @@ 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 &&
-        ./tools/google_play_upload.py production ${GOOGLE_PLAY_PKG} ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk;
+        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
 
 before_deploy:
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index 58d892d3a..3e7692803 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -9,6 +9,9 @@ VERSIONCODE=$(($(($minor*10000)) + $VERSIONCODE))
 VERSIONCODE=$(($(($patch*1000)) + $VERSIONCODE))
 VERSIONCODE=$(($(($dev)) + $VERSIONCODE))
 
+# Command line specifies either 32 or 64 bit version
+VERSIONCODE=$1$VERSIONCODE
+
 MANIFEST_FILE=android/AndroidManifest.xml
 
 # manifest package
-- 
2.22.0