Ignore android-* tags when using git describe

scripts/git-version

@@ -6,7 +6,7 @@ TARBALL=$SRCDIR/.tarball-git-version
 if test -f $TARBALL; then
 	V=$(cat $TARBALL)
 elif test -d $SRCDIR/.git; then
-	V=$(git -C $SRCDIR describe --tags HEAD 2>/dev/null)
+	V=$(git -C $SRCDIR describe --exclude 'android-*' --tags HEAD 2>/dev/null)
 fi
 
 if test -z "$V"; then

scripts/test.sh

@@ -468,7 +468,7 @@ sonarcloud)
 		-Dsonar.projectKey=${SONAR_PROJECT} \
 		-Dsonar.organization=${SONAR_ORGANIZATION} \
 		-Dsonar.login=${SONAR_TOKEN} \
-		-Dsonar.projectVersion=$(git describe)+${BUILD_NUMBER} \
+		-Dsonar.projectVersion=$(git describe --exclude 'android-*')+${BUILD_NUMBER} \
 		-Dsonar.sources=. \
 		-Dsonar.cfamily.threads=2 \
 		-Dsonar.cfamily.cache.enabled=true \