Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
6a6d81cc
Commit
6a6d81cc
authored
Jul 26, 2016
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update android version
parent
0072495f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
AndroidManifest.xml
android/AndroidManifest.xml
+1
-1
update_android_version.sh
tools/update_android_version.sh
+2
-3
No files found.
android/AndroidManifest.xml
View file @
6a6d81cc
<?xml version="1.0"?>
<manifest
package=
"org.mavlink.qgroundcontrol"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:versionName=
"
2.9.7b-362-g303a70c"
android:versionCode=
"2888
"
android:installLocation=
"auto"
>
<manifest
package=
"org.mavlink.qgroundcontrol"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:versionName=
"
3.0.0"
android:versionCode=
"2970
"
android:installLocation=
"auto"
>
<application
android:hardwareAccelerated=
"true"
android:name=
"org.qtproject.qt5.android.bindings.QtApplication"
android:label=
"-- %%INSERT_APP_NAME%% --"
android:icon=
"@drawable/icon"
>
<activity
android:configChanges=
"orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
android:name=
"org.qgroundcontrol.qgchelper.UsbDeviceJNI"
android:label=
"-- %%INSERT_APP_NAME%% --"
android:screenOrientation=
"sensorLandscape"
android:launchMode=
"singleTask"
android:keepScreenOn=
"true"
>
<intent-filter>
...
...
tools/update_android_version.sh
View file @
6a6d81cc
#!/usr/bin/env bash
# this requires `master` in the git tree
# travis-ci branch builds are unable to set the version properly
# this requires `origin/master` in the git tree
MANIFEST_FILE
=
android/AndroidManifest.xml
VERSIONCODE
=
`
git rev-list master
--first-parent
--count
`
VERSIONCODE
=
`
git rev-list
origin/
master
--first-parent
--count
`
VERSIONNAME
=
`
git describe
--always
--tags
|
sed
-e
's/^v//'
`
if
[
-n
"
$VERSIONCODE
"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment