From 97fcff025440aaa62e9af50769d7962b142871f8 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 4 Apr 2018 17:56:33 +0100
Subject: [PATCH] Try to identify versions of adb that have whacky error prints

---
 renderdoc/android/android.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp
index 2a9551a22..e912316aa 100644
--- a/renderdoc/android/android.cpp
+++ b/renderdoc/android/android.cpp
@@ -176,6 +176,11 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag
   if(RDCLib.size() < installedPath.size() || RDCLib.substr(0, installedPath.size()) != installedPath)
     RDCLib.clear();
 
+  // some versions of adb/android also don't print any error message at all! Look to see if the
+  // wildcard glob is still present.
+  if(RDCLib.find("/lib/*/" RENDERDOC_ANDROID_LIBRARY) != std::string::npos)
+    RDCLib.clear();
+
   bool injectLibraries = true;
 
   if(RDCLib.empty())