From 5e2bfccab4e8489da02c01a8fca1f568de50e6b7 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sat, 5 Feb 2022 09:37:00 +0100
Subject: [PATCH] Expose adb executable path publicly

This will allow the caller to build the argv array directly.
---
 app/src/adb/adb.c | 6 +++---
 app/src/adb/adb.h | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/adb/adb.c b/app/src/adb/adb.c
index 44c197eb..ded0298b 100644
--- a/app/src/adb/adb.c
+++ b/app/src/adb/adb.c
@@ -13,8 +13,8 @@
 
 static const char *adb_executable;
 
-static inline const char *
-get_adb_executable(void) {
+const char *
+sc_adb_get_executable(void) {
     if (!adb_executable) {
         adb_executable = getenv("ADB");
         if (!adb_executable)
@@ -163,7 +163,7 @@ sc_adb_create_argv(const char *serial, const char *const adb_cmd[],
         return NULL;
     }
 
-    argv[0] = get_adb_executable();
+    argv[0] = sc_adb_get_executable();
     int i;
     if (serial) {
         argv[1] = "-s";
diff --git a/app/src/adb/adb.h b/app/src/adb/adb.h
index 34fd7866..8b8954f8 100644
--- a/app/src/adb/adb.h
+++ b/app/src/adb/adb.h
@@ -14,6 +14,9 @@
 
 #define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)
 
+const char *
+sc_adb_get_executable(void);
+
 sc_pid
 sc_adb_execute(const char *serial, const char *const adb_cmd[], size_t len,
                unsigned flags);