From b81a9fdcc7425fe7ae5eff7c99dcf00dd21f7070 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Thu, 3 Oct 2019 10:52:30 -0700
Subject: [PATCH] Fix daily build upload to Google Play

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

diff --git a/.travis.yml b/.travis.yml
index 312a815..b5e1c8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,7 +162,7 @@ before_script:
   - if [ "${SPEC}" = "android-clang" ]; then
         git remote set-branches origin 'master' &&
         git fetch --tags origin master &&
-        ./tools/update_android_version.sh ${BITNESS};
+        ./tools/update_android_version.sh ${BITNESS} ${TRAVIS_BRANCH};
     fi
 
 script:
diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh
index 3e76928..262e9d2 100755
--- a/tools/update_android_version.sh
+++ b/tools/update_android_version.sh
@@ -15,7 +15,7 @@ VERSIONCODE=$1$VERSIONCODE
 MANIFEST_FILE=android/AndroidManifest.xml
 
 # manifest package
-if [ ${#dev} -gt 0 ]; then
+if [ "$2" = "master" ]; then
 	QGC_PKG_NAME="org.mavlink.qgroundcontrolbeta"
 	sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE
 	echo "Android package name: $QGC_PKG_NAME"