Launcher: modified for wearable profile

Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 82e55db..9b4f8b1 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-manager
-Version: 2.4.42
+Version: 2.4.43
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package: emulator-manager

diff --git a/plugin-project/wearable-plugin/em-plugin.jar b/plugin-project/wearable-plugin/em-plugin.jar
deleted file mode 100644 (file)
index ac26a0a..0000000
Binary files a/plugin-project/wearable-plugin/em-plugin.jar and /dev/null differ

diff --git a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
index ea94295..f3b79f2 100644 (file)
--- a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
+++ b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
@@ -34,6 +34,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 
 import org.eclipse.swt.widgets.Display;
@@ -339,7 +340,7 @@ public class Launcher implements ILauncher {
 
                        // for sensor
                        cmd.add("-device");
-                       cmd.add("virtio-sensor-pci");
+                       cmd.add("virtio-sensor-pci,sensors=accel&gyro");
 
                        // for battery
                        cmd.add("-device");
@@ -347,7 +348,7 @@ public class Launcher implements ILauncher {
 
                        // for jack
                        cmd.add("-device");
-                       cmd.add("virtio-jack-pci");
+                       cmd.add("virtio-jack-pci,jacks=charger&usb");
 
                        cmd.add("-device");
                        cmd.add("codec-pci");
@@ -489,6 +490,12 @@ public class Launcher implements ILauncher {
        @Override
        public Process launch(List<String> cmd) {
                ProcessBuilder pb = new ProcessBuilder(cmd);
+               if (EmulatorManager.isLinux()) {
+                       Map<String, String> env = pb.environment();
+                       String value = env.get("LD_LIBRARY_PATH");
+                       env.put("LD_LIBRARY_PATH", ((value == null) ? "" : value + ":") + FilePathResources.getBinPath() + ":" + FilePathResources.getRemotePath() + File.separator + "lib:");
+                       EMLogger.getLogger().log(Level.INFO, "LD_LIBRARY_PATH: " + env.get("LD_LIBRARY_PATH"));
+               }
 
                if (this.binPath == null || this.binPath.isEmpty()) {
                        pb.directory(new File(FilePathResources.getBinPath()));