From 0c37a93a84ccff6fe0c50dfdb09607da232a4701 Mon Sep 17 00:00:00 2001
From: Sidd Srinivasan <siddsrinivasan@fb.com>
Date: Tue, 30 Jul 2019 07:03:17 -0700
Subject: [PATCH] Add path to adb in production env

Summary: Move from adding adb path in tracery plugin to adding flipper as a whole. Se discussion here: D16494684

Reviewed By: jknoxville

Differential Revision: D16542414

fbshipit-source-id: abb2f4989693025a8bfe7d12f4c328870a962204
---
 static/setup.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/static/setup.js b/static/setup.js
index f52d57baf..2d1bbb381 100644
--- a/static/setup.js
+++ b/static/setup.js
@@ -16,9 +16,10 @@ module.exports = function(argv) {
 
   // emulator/emulator is more reliable than tools/emulator, so prefer it if
   // it exists
-  process.env.PATH = `${process.env.ANDROID_HOME}/emulator:${
-    process.env.ANDROID_HOME
-  }/tools:${process.env.PATH}`;
+  process.env.PATH =
+    ['emulator', 'tools', 'platform-tools']
+      .map(directory => `${process.env.ANDROID_HOME}/${directory}`)
+      .join(':') + `:${process.env.PATH}`;
 
   // ensure .flipper folder and config exist
   const flipperDir = path.join(os.homedir(), '.flipper');