From 5863607ba20296a4918fde5d5eaa9d5ca7caca7b Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Fri, 21 Apr 2017 13:23:15 -0600 Subject: [PATCH] android: Attempt to call adb directly if path not provided --- renderdoc/replay/entry_points.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index 336dd2f49..23b7c6f39 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -544,6 +544,16 @@ bool IsHostADB(const char *hostname) string adbExecCommand(const string &args) { string adbExePath = RenderDoc::Inst().GetConfigSetting("adbExePath"); + if(adbExePath.empty()) + { + static bool warnPath = true; + if(warnPath) + { + RDCWARN("adbExePath not set, attempting to call 'adb' in working env"); + warnPath = false; + } + adbExePath.append("adb"); + } Process::ProcessResult result; Process::LaunchProcess(adbExePath.c_str(), "", args.c_str(), &result); RDCLOG("COMMAND: adb %s", args.c_str());