Skip to content

Q
qgroundcontrol
Commit 6a6d81cc authored by Daniel Agar's avatar Daniel Agar
Browse files
Options

update android version

parent 0072495f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
android/AndroidManifest.xml
View file @ 6a6d81cc
<?xml version="1.0"?> <?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"> <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"> <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> <intent-filter>
......
tools/update_android_version.sh
View file @ 6a6d81cc
#!/usr/bin/env bash #!/usr/bin/env bash
# this requires `master` in the git tree # this requires `origin/master` in the git tree
# travis-ci branch builds are unable to set the version properly
MANIFEST_FILE=android/AndroidManifest.xml 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//'` VERSIONNAME=`git describe --always --tags | sed -e 's/^v//'`
if [ -n "$VERSIONCODE" ]; then if [ -n "$VERSIONCODE" ]; then
......
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