Proxy: Changed proxy argument in launch config file.

- Added "network_proxy" variable.

Change-Id: I16197a579146093a54e6b217565769814237f45d
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/common-project/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java b/common-project/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java
index cdf8756..602127a 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java
+++ b/common-project/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java
@@ -49,8 +49,10 @@ public class NetProxyOption extends Option {
        @Override
        public void getLaunchArgument(LaunchConfig config, VMProperty property)
                        throws VMWorkerException {
-               if (EmulatorManager.isLinux() || EmulatorManager.isWin()) {
-                       config.addKernelOption(getProxy(property));
+               String proxyArgument = getProxy(property);
+               if (!proxyArgument.isEmpty()) {
+                       config.addVariable(VAR_NETWORK_PROXY, proxyArgument);
+                       config.addKernelOption(varForm(VAR_NETWORK_PROXY));
                }
        }
 

diff --git a/common-project/src/org/tizen/emulator/manager/vms/option/Option.java b/common-project/src/org/tizen/emulator/manager/vms/option/Option.java
index a799203..34bc955 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/vms/option/Option.java
+++ b/common-project/src/org/tizen/emulator/manager/vms/option/Option.java
@@ -55,6 +55,7 @@ public abstract class Option implements IOption {
        public static String VAR_KERNEL = "kernel";
        public static String VAR_KERNEL_LOG = "kernel_log";
        public static String VAR_APPEND = "append";
+       public static String VAR_NETWORK_PROXY = "network_proxy";
 
        private static Map<Class<? extends IOption>, IOption> instanceMap = new HashMap<Class<? extends IOption>, IOption>();