Merge pull request #7861 from DonLakeFlyer/GooglePlay

Fix daily build upload to Google Play

.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:

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"