Skip to content

Q
qgroundcontrol
Commit b81a9fdc authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent cca155c2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
.travis.yml
View file @ b81a9fdc
...@@ -162,7 +162,7 @@ before_script: ...@@ -162,7 +162,7 @@ before_script:
- if [ "${SPEC}" = "android-clang" ]; then - if [ "${SPEC}" = "android-clang" ]; then
git remote set-branches origin 'master' && git remote set-branches origin 'master' &&
git fetch --tags origin master && git fetch --tags origin master &&
./tools/update_android_version.sh ${BITNESS}; ./tools/update_android_version.sh ${BITNESS} ${TRAVIS_BRANCH};
fi fi
script: script:
......
tools/update_android_version.sh
View file @ b81a9fdc
...@@ -15,7 +15,7 @@ VERSIONCODE=$1$VERSIONCODE ...@@ -15,7 +15,7 @@ VERSIONCODE=$1$VERSIONCODE
MANIFEST_FILE=android/AndroidManifest.xml MANIFEST_FILE=android/AndroidManifest.xml
# manifest package # manifest package
if [ ${#dev} -gt 0 ]; then if [ "$2" = "master" ]; then
QGC_PKG_NAME="org.mavlink.qgroundcontrolbeta" QGC_PKG_NAME="org.mavlink.qgroundcontrolbeta"
sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE
echo "Android package name: $QGC_PKG_NAME" echo "Android package name: $QGC_PKG_NAME"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment