Merge pull request #7934 from DonLakeFlyer/AndroidDaily

Android: "-" not allowed in packed names

.travis.yml

@@ -199,11 +199,11 @@ after_success:
   - cd ${TRAVIS_BUILD_DIR}
 
   # master development builds to beta track
-  - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol-daily
+  - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily
   - if [ "${TRAVIS_TAG}" ]; then
         GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol;
     elif [ "${TRAVIS_BRANCH}" = "master" ]; then
-        GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol-daily;
+        GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily;
     else
         GOOGLE_PLAY_PKG=none;
     fi

tools/update_android_version.sh

@@ -13,7 +13,7 @@ MANIFEST_FILE=android/AndroidManifest.xml
 
 # manifest package
 if [ "$2" = "master" ]; then
-	QGC_PKG_NAME="org.mavlink.qgroundcontrol-daily"
+	QGC_PKG_NAME="org.mavlink.qgroundcontroldaily"
 	sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE
 	echo "Android package name: $QGC_PKG_NAME"
 fi