jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using settings for android sdk location

Browse Source 
Summary: A settings screen has been added where android home can be set. This changes the downstream code to use this value rather than the `env.PATH` variable.

Reviewed By: passy

Differential Revision: D17713288

fbshipit-source-id: 51551652c9c2f468e1117c18785123348e4b4576
This commit is contained in:
John Knox
2019-10-07 08:49:05 -07:00
committed by Facebook Github Bot
parent 85c0ec0d13
commit 729e74f2fc
11 changed files with 72 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/listDevices.tsx
View File

@@ -7,9 +7,10 @@
import {getActiveAndroidDevices} from '../dispatcher/androidDevice';
import {getActiveDevicesAndSimulators} from '../dispatcher/iOSDevice';
import BaseDevice from '../devices/BaseDevice';
import {Store} from '../reducers/index';
export async function listDevices(): Promise<Array<BaseDevice>> {
const androidDevices = await getActiveAndroidDevices();
export async function listDevices(store: Store): Promise<Array<BaseDevice>> {
const androidDevices = await getActiveAndroidDevices(store);
const iOSDevices: BaseDevice[] = await getActiveDevicesAndSimulators();
return iOSDevices.concat(androidDevices);
}