lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-12 18:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always use git commit hash to identify android build

Browse Source 
* This prevents reinstall issues if the UI is looking for a plain major/
  minor versionName and the apk was built with a commit hash.
This commit is contained in:
baldurk
2018-04-04 16:52:44 +01:00
parent c5612dc7dc
commit 35865efef2
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+1 -1
View File
@@ -435,7 +435,7 @@ bool CheckAndroidServerVersion(const string &deviceID)
// Compare the server's versionCode and versionName with the host's for compatibility
std::string hostVersionCode =
string(STRINGIZE(RENDERDOC_VERSION_MAJOR)) + string(STRINGIZE(RENDERDOC_VERSION_MINOR));
std::string hostVersionName = RENDERDOC_STABLE_BUILD ? MAJOR_MINOR_VERSION_STRING : GitVersionHash;
std::string hostVersionName = GitVersionHash;
// False positives will hurt us, so check for explicit matches
if((hostVersionCode == versionCode) && (hostVersionName == versionName))