get adb config from env vars

Summary:
REact adb config from env vars:
- `ADB_SERVER_SOCKET`
- `ANDROID_ADB_SERVER_PORT`

Reviewed By: lawrencelomax

Differential Revision: D14002603

fbshipit-source-id: e30fa4354ab15048d4350654979fd0b6f394cd89
This commit is contained in:
Daniel Büchele
2019-02-11 02:48:14 -08:00
committed by Facebook Github Bot
parent 3c35d6d4cf
commit 6431d374c2
4 changed files with 75 additions and 9 deletions

View File

@@ -20,6 +20,7 @@ const tmpFile = promisify(tmp.file);
const tmpDir = promisify(tmp.dir);
import iosUtil from '../fb-stubs/iOSContainerUtility';
import {reportPlatformFailures} from './metrics';
import adbConfig from './adbConfig';
// Desktop file paths
const os = require('os');
@@ -75,9 +76,7 @@ export default class CertificateProvider {
constructor(server: Server, logger: LogManager) {
this.logger = logger;
this.adb = adb.createClient({
port: process.env.ANDROID_ADB_SERVER_PORT || '5037',
});
this.adb = adb.createClient(adbConfig());
this.certificateSetup = reportPlatformFailures(
this.ensureServerCertExists(),
'ensureServerCertExists',