From abe08f85600a113d8594b924f65ca7bf24aecb6e Mon Sep 17 00:00:00 2001
From: Nirothipan <nirothipan@gmail.com>
Date: Fri, 23 Jun 2017 15:42:40 +0530
Subject: [PATCH] changes due to change in folder structure of SDK

---
 .../org.carbon.android.emulator/TryIt.java     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
index 10ff7f0e80..5ca395e3c6 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
@@ -766,6 +766,22 @@ public class TryIt {
             default:
                 qemuSystemFileLocation += osSuffix + "-x86_64" + File.separator + "qemu-system-i386";
         }
+        setExecutePermission(qemuSystemFileLocation);
+
+        qemuSystemFileLocation = androidSdkHome + File.separator + "emulator" + File.separator
+                + "qemu" + File.separator;
+
+        switch (osSuffix) {
+            case Constants.MAC_OS:
+                qemuSystemFileLocation += Constants.MAC_DARWIN + "-x86_64" + File.separator + "qemu-system-i386";
+                break;
+            case Constants.WINDOWS_OS:
+                qemuSystemFileLocation += osSuffix + "-x86_64" + File.separator + "qemu-system-i386.exe";
+                break;
+            default:
+                qemuSystemFileLocation += osSuffix + "-x86_64" + File.separator + "qemu-system-i386";
+        }
+
         killServer();
         setExecutePermission(qemuSystemFileLocation);
         ExecutorService service = Executors.newSingleThreadExecutor();
@@ -823,8 +839,6 @@ public class TryIt {
                     System.exit(1);      // if can't execute, unable to proceed
                 }
             }
-        } else {
-            System.out.println("WARN : " + fileName + " does not exists");
         }
     }