From 0ad13a0606e9f9e30637b17b638d978b85eb2634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20B=C3=BCchele?= <danielbuechele@fb.com>
Date: Thu, 7 Feb 2019 06:33:37 -0800
Subject: [PATCH] use ANDROID_ADB_SERVER_PORT in adbkit

Summary: Using `ANDROID_ADB_SERVER_PORT` env var to create adbkit instance.

Reviewed By: jknoxville

Differential Revision: D13987361

fbshipit-source-id: 2283b52466f8ad536aa3a8320a4ee8f4ce97321a
---
 src/dispatcher/androidDevice.js  | 6 +++++-
 src/utils/CertificateProvider.js | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/dispatcher/androidDevice.js b/src/dispatcher/androidDevice.js
index e637e0bbe..b663d3eb8 100644
--- a/src/dispatcher/androidDevice.js
+++ b/src/dispatcher/androidDevice.js
@@ -79,7 +79,11 @@ export default (store: Store, logger: Logger) => {
             );
           }
         })
-        .then(adb.createClient),
+        .then(() =>
+          adb.createClient({
+            port: process.env.ANDROID_ADB_SERVER_PORT || '5037',
+          }),
+        ),
       'createADBClient.shell',
     ).catch(err => {
       console.error(
diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js
index 1dd051dcd..81000b685 100644
--- a/src/utils/CertificateProvider.js
+++ b/src/utils/CertificateProvider.js
@@ -75,7 +75,9 @@ export default class CertificateProvider {
 
   constructor(server: Server, logger: LogManager) {
     this.logger = logger;
-    this.adb = adb.createClient();
+    this.adb = adb.createClient({
+      port: process.env.ANDROID_ADB_SERVER_PORT || '5037',
+    });
     this.certificateSetup = reportPlatformFailures(
       this.ensureServerCertExists(),
       'ensureServerCertExists',