Update emulator path to emulator directory instead of deprecated tool… (#3046)

Summary:
…s directory

Currently, flipper tries to launch emulators using  `<android sdk path>\tools\emulator.exe`. The use of this emulator path has been deprecated for a while now, and remains in the sdk for those on versions of Android Studio 2.2 and older (see https://issuetracker.google.com/issues/66886035?pli=1). The supported path is `<android sdk path>\emulator\emulator.exe`. Trying to use the deprecated path on Windows results in a failure to launch AVDs.

## Changelog

Point emulator path to emulator directory instead of deprecated tools directory.

Pull Request resolved: https://github.com/facebook/flipper/pull/3046

Test Plan: Verified a failure to launch the AVD on windows using the deprecated path. Confirmed that updating the path results in a successful launch and the device showing up in flipper.

Reviewed By: passy

Differential Revision: D32489840

Pulled By: nikoant

fbshipit-source-id: dde5bf5a29e89549f160d9d71133ff70398e1c1d
This commit is contained in:
Ranesh Saha
2021-11-17 05:09:42 -08:00
committed by Facebook GitHub Bot
parent 00fc146f55
commit d8824fb130
2 changed files with 2 additions and 2 deletions

View File

@@ -283,7 +283,7 @@ export async function launchEmulator(name: string, coldBoot: boolean = false) {
.catch(() => .catch(() =>
join( join(
process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT || '', process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT || '',
'tools', 'emulator',
'emulator', 'emulator',
), ),
) )

View File

@@ -129,7 +129,7 @@ export class AndroidDeviceManager {
} catch (_e) { } catch (_e) {
this.emulatorPath = join( this.emulatorPath = join(
process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT || '', process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT || '',
'tools', 'emulator',
'emulator', 'emulator',
); );
} }