Update Android emulator path to support SDK Tools >=25.3.0 (#700)

Update Android emulator path to support SDK Tools >=25.3.0
wix · May 19, 2018 · cfdc279 · cfdc279
1 parent 3df931f
commit cfdc279
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/detox/src/devices/android/Emulator.js b/detox/src/devices/android/Emulator.js
@@ -10,7 +10,9 @@ const argparse = require('../../utils/argparse');
 
 class Emulator {
   constructor() {
-    this.emulatorBin = path.join(Environment.getAndroidSDKPath(), 'tools', 'emulator');
+    const newEmulatorPath = path.join(Environment.getAndroidSDKPath(), 'emulator', 'emulator');
+    const oldEmulatorPath = path.join(Environment.getAndroidSDKPath(), 'tools', 'emulator');
+    this.emulatorBin = fs.existsSync(newEmulatorPath) ? newEmulatorPath : oldEmulatorPath;
   }
 
   async listAvds() {