[Android] In-app build version and package manifest don't match

[Leopard20]

Not a big issue, but I don't know why the in-app build version doesn't match the actual version of the package.
For example, build 804 version in AndroidManifest.xml is 1.5.4-790 instead of 1.5.4-804.
But the in-app reported version is 1.5.4-804.
It's a bit confusing to some people, don't you think?

[hrydgard]

Seems like some artifact of how the buildbot checks out the repo, what do you think @Orphis ?

[Florin9doi]

In game version name uses git describe --always (git-version.cmake >> git-version.cpp)
and AndroidManifest uses androidGitVersion.
Those 2 ways of getting version name produces different results:

ppsspp> git describe --always
v1.6.3-542-g208b0d8a4

ppsspp> gradlew --quiet androidGitVersion
Overriding Android Version Name, Code: 1.6.3-531-0008-dirty 16030531
androidGitVersion.name  1.6.3-531-0008-dirty
androidGitVersion.code  16030531

[unknownbrackets]

That's weird, maybe it's ignoring certain commits in its counting? The code looks like it should skip that without onlyIn, though.

Ultimately, we want the build version to be the same across all platforms, so I'd assert that androidGitVersion is the one that is "wrong" here.

-[Unknown]

[Florin9doi]

I'm thinking about the commits made before tag, but merged after tag.
For the last few apks the difference is constant: 11

[hrydgard]

I'm pushing this one forward, not critical enough (but definitely annoying!)