commit fb1b5dc0e468a7334379bfc1cf373420ae55d595
author Greg Hartman <ghartman@google.com> Fri Dec 21 09:58:11 2018 -0800
committer Greg Hartman <ghartman@google.com> Fri Jan 04 00:59:35 2019 +0000
tree 9ec0ca40ffc22dbfbcc5db495354e9f7b2201eb0
parent b595ac0629c7d5734fb2bd1950585467d525fbab

adbshell: Prefer /home/vsoc-0[1-8]/bin/adb to /usr/bin/adb

BUG: 121378043
BUG: 122328187
Test: Uploaded to 0.7.2 host image and checked adb
Change-Id: I64c17b8f71ab8fad799bd21387b50aee142dfda5
(cherry picked from commit 9a089876a12db2c519317685fccafb6ad9dd6246)

host/commands/adbshell/main.cpp

diff --git a/host/commands/adbshell/main.cpp b/host/commands/adbshell/main.cpp
index 68ac18e..d893247 100644
--- a/host/commands/adbshell/main.cpp
+++ b/host/commands/adbshell/main.cpp
@@ -25,6 +25,8 @@
 #include <cstring>
 #include <string>
 #include <vector>
+
+#include <errno.h>
 #include <unistd.h>
 
 // Many of our users interact with CVDs via ssh. They expect to be able to
@@ -65,6 +67,14 @@
          "/cuttlefish_runtime/cuttlefish_config.json";
 }
 
+std::string CuttlefishFindAdb() {
+  std::string rval = std::string("/home/") + VsocUser() + "/bin/adb";
+  if (TEMP_FAILURE_RETRY(access(rval.c_str(), X_OK)) == -1) {
+    return "/usr/bin/adb";
+  }
+  return rval;
+}
+
 void SetCuttlefishConfigEnv() {
   setenv(vsoc::kCuttlefishConfigEnvVarName, CuttlefishConfigLocation().c_str(),
          true);
@@ -74,9 +84,10 @@
 int main(int argc, char* argv[]) {
   SetCuttlefishConfigEnv();
   auto instance = vsoc::CuttlefishConfig::Get()->adb_device_name();
+  std::string adb_path = CuttlefishFindAdb();
 
   std::vector<char*> new_argv = {
-      const_cast<char*>("/usr/bin/adb"), const_cast<char*>("-s"),
+      const_cast<char*>(adb_path.c_str()), const_cast<char*>("-s"),
       const_cast<char*>(instance.c_str()), const_cast<char*>("shell"),
       const_cast<char*>("/system/bin/sh")};