Use setProcessState
Summary: `setProcessState` does some adjusting to PATH. This was only ever done for Electron. This change moves that functionality to FlipperServerImpl which is the one what orchestrates. By doing this, flipper server also benefits from getting these adjustments. Reviewed By: antonk52 Differential Revision: D46836659 fbshipit-source-id: f98291d320cf9b7f3808223af8745c068b1318ce
This commit is contained in:
committed by
Facebook GitHub Bot
parent
b4f0657f4f
commit
165a989cc6
@@ -39,7 +39,6 @@ import {
|
||||
Logger,
|
||||
parseEnvironmentVariables,
|
||||
setLoggerInstance,
|
||||
Settings,
|
||||
wrapRequire,
|
||||
} from 'flipper-common';
|
||||
import constants from './fb-stubs/constants';
|
||||
@@ -53,7 +52,6 @@ import {initCompanionEnv} from 'flipper-server-companion';
|
||||
import ReconnectingWebSocket from 'reconnecting-websocket';
|
||||
import WS from 'ws';
|
||||
import {Module} from 'module';
|
||||
import os from 'os';
|
||||
|
||||
Module.prototype.require = wrapRequire(Module.prototype.require);
|
||||
enableMapSet();
|
||||
@@ -242,8 +240,6 @@ async function start() {
|
||||
electronIpcClient,
|
||||
);
|
||||
|
||||
setProcessState(flipperServerConfig.settings);
|
||||
|
||||
// By turning this in a require, we force the JS that the body of this module (init) has completed (initializeElectron),
|
||||
// before starting the rest of the Flipper process.
|
||||
// This prevent issues where the render host is referred at module initialisation level,
|
||||
@@ -332,22 +328,3 @@ function createDelegatedLogger(): Logger {
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function setProcessState(settings: Settings) {
|
||||
const androidHome = settings.androidHome;
|
||||
const idbPath = settings.idbPath;
|
||||
|
||||
if (!process.env.ANDROID_HOME && !process.env.ANDROID_SDK_ROOT) {
|
||||
process.env.ANDROID_HOME = androidHome;
|
||||
process.env.ANDROID_SDK_ROOT = androidHome;
|
||||
}
|
||||
|
||||
// emulator/emulator is more reliable than tools/emulator, so prefer it if
|
||||
// it exists
|
||||
process.env.PATH =
|
||||
['emulator', 'tools', 'platform-tools']
|
||||
.map((directory) => path.resolve(androidHome, directory))
|
||||
.join(':') +
|
||||
`:${idbPath}` +
|
||||
`:${process.env.PATH}`;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user