From 26ed0875cbe89191f19ed6a7cd66e208234c8f0a Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Fri, 8 Oct 2021 09:44:08 -0700
Subject: [PATCH] Change adb path resolution

Summary:
Quick drive-by change.

`path.resolve` accepts var-args so we don't resolve
to the wrong path on non-Unix systems.

Reviewed By: mweststrate

Differential Revision: D31502481

fbshipit-source-id: a963cd37d13eb8ef68bccf375f3e074fa8961a9e
---
 desktop/app/src/server/devices/android/adbClient.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/app/src/server/devices/android/adbClient.tsx b/desktop/app/src/server/devices/android/adbClient.tsx
index 64de7c469..60dfa0772 100644
--- a/desktop/app/src/server/devices/android/adbClient.tsx
+++ b/desktop/app/src/server/devices/android/adbClient.tsx
@@ -31,7 +31,7 @@ export function getAdbClient(config: Config): Promise<Client> {
    manually before requesting a client. */
 async function createClient(config: Config): Promise<Client> {
   const androidHome = config.androidHome;
-  const adbPath = path.resolve(androidHome, 'platform-tools/adb');
+  const adbPath = path.resolve(androidHome, 'platform-tools', 'adb');
   return reportPlatformFailures<Client>(
     execFile(adbPath, ['start-server']).then(() =>
       adbkit.createClient(adbConfig()),