fixed #204 Missing emulator engine program for 'x86' CPU

NBANDROIDTEAM · Apr 29, 2019 · 312ad1e · 312ad1e
1 parent 8813f22
commit 312ad1e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/nbandroid.core/src/main/java/org/nbandroid/netbeans/gradle/launch/EmulatorLauncher.java b/nbandroid.core/src/main/java/org/nbandroid/netbeans/gradle/launch/EmulatorLauncher.java
@@ -158,7 +158,14 @@ public IDevice call() throws Exception {
     }
 
     private String getEmulatorBinaryPath() {
+        //fix #204 Since March 2017 (v25.3.0), the Android Emulator changed location from${ANDROID_SDK_ROOT}/tools/ to its own top-level directory, ${ANDROID_SDK_ROOT}/emulator/
+        String newEmulatorPath = sdk.getSdkPath() + File.separator
+                + SdkConstants.FD_EMULATOR + File.separator+ SdkConstants.FN_EMULATOR;
+        if(new File(newEmulatorPath).exists()){
+            return newEmulatorPath;
+        }
         return sdk.getSdkPath() + File.separator
                 + SdkConstants.OS_SDK_TOOLS_FOLDER + SdkConstants.FN_EMULATOR;
+
     }
 }