Merge pull request #8140 from DonLakeFlyer/Android64

Switch back to old android deploy, 64 bit only for now

.travis.yml

@@ -25,11 +25,11 @@ matrix:
           env: SPEC=linux-g++-64 CONFIG=debug
           services: xvfb
           sudo: required
-        - name: "Android 32 bit"
-          dist: trusty
-          language: android
-          env: SPEC=android-clang CONFIG=installer BITNESS=32
-          sudo: false
+#        - name: "Android 32 bit"
+#          dist: trusty
+#          language: android
+#          env: SPEC=android-clang CONFIG=installer BITNESS=32
+#          sudo: false
         - name: "Android 64 bit"
           dist: trusty
           language: android
@@ -107,16 +107,16 @@ install:
     fi
 
   - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "64" ]]; then
-        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.4-android_arm64_v8a-min.tar.bz2 &&
-        tar jxf Qt5.12.4-android_arm64_v8a-min.tar.bz2 -C /tmp &&
-        export PATH=/tmp/Qt5.12-android_arm64_v8a/5.12.4/android_arm64_v8a/bin:$PATH
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-android_arm64_v8a-min.tar.bz2 &&
+        tar jxf Qt5.12.6-android_arm64_v8a-min.tar.bz2 -C /tmp &&
+        export PATH=/tmp/Qt5.12-android_arm64_v8a/5.12.6/android_arm64_v8a/bin:$PATH
         ;
     fi
 
   - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "32" ]]; then
-        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.4-android_armv7-min.tar.bz2 &&
-        tar jxf Qt5.12.4-android_armv7-min.tar.bz2 -C /tmp &&
-        export PATH=/tmp/Qt5.12-android_armv7/5.12.4/android_armv7/bin:$PATH
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-android_armv7-min.tar.bz2 &&
+        tar jxf Qt5.12.6-android_armv7-min.tar.bz2 -C /tmp &&
+        export PATH=/tmp/Qt5.12-android_armv7/5.12.6/android_armv7/bin:$PATH
         ;
     fi
 
@@ -199,11 +199,11 @@ after_success:
   - cd ${TRAVIS_BUILD_DIR}
 
   # master development builds to beta track
-  - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily
+  - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta
   - if [ "${TRAVIS_TAG}" ]; then
         GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol;
     elif [ "${TRAVIS_BRANCH}" = "master" ]; then
-        GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily;
+        GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta;
     else
         GOOGLE_PLAY_PKG=none;
     fi