From 159fff4ee8c2781c9dfe0586540ccde9a8b46c1d Mon Sep 17 00:00:00 2001 From: Munkyu Im Date: Tue, 28 Apr 2015 21:31:53 +0900 Subject: [PATCH] net: not use proxy from emulator-manager emulator uses legacy argument setting so far. so not to use new argument setting now. Change-Id: I78108f028f1ba179c3a8a501c9fbedf83479da15 Signed-off-by: Munkyu Im --- tizen/src/emulator.c | 4 +++- tizen/src/skin/maruskin_client.c | 12 +----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index fab2129e97..bc41fcdde9 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -225,7 +225,6 @@ static void prepare_basic_features(gchar * const kernel_cmdline) tmp_str = g_strdup_printf(" sdb_port=%d," " vm_resolution=%dx%d", get_emul_vm_base_port(), get_emul_resolution_width(), get_emul_resolution_height()); - http_proxy_setup(); g_strlcat(kernel_cmdline, tmp_str, LEN_MARU_KERNEL_CMDLINE); @@ -401,6 +400,9 @@ static int emulator_main(int argc, char *argv[], char **envp) g_strfreev(splitted); } + // set host proxy + http_proxy_setup(); + // assemble arguments for qemu and skin if (!assemble_profile_args(&_qemu_argc, _qemu_argv, &_skin_argc, _skin_argv)) { diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c index 63f0f61dcf..31f6ec7cb8 100644 --- a/tizen/src/skin/maruskin_client.c +++ b/tizen/src/skin/maruskin_client.c @@ -66,8 +66,6 @@ MULTI_DEBUG_CHANNEL(qemu, skinclient); #define OPT_INPUT_MOUSE "input.mouse" #define OPT_INPUT_TOUCH "input.touch" #define OPT_MAX_TOUCHPOINT "input.touch.maxpoint" -#define OPT_PROXY_ADDR "proxy.addr" -#define OPT_PROXY_PORT "proxy.port" #define OPT_BOOLEAN_TRUE "true" #define OPT_BOOLEAN_FALSE "false" @@ -196,11 +194,7 @@ static void *run_skin_client(void *arg) strlen(buf_input) + EQUAL_LEN + strlen(OPT_BOOLEAN_TRUE) + SPACE_LEN + strlen(OPT_MAX_TOUCHPOINT) + EQUAL_LEN + - len_maxtouchpoint + SPACE_LEN + - strlen(OPT_PROXY_ADDR) + EQUAL_LEN + - strlen(buf_proxy_addr) + SPACE_LEN + - strlen(OPT_PROXY_PORT) + EQUAL_LEN + - strlen(buf_proxy_port) + SPACE_LEN + 1 + + len_maxtouchpoint + SPACE_LEN + 1 + strlen(argv); INFO("skin command length : %d\n", cmd_len); @@ -220,8 +214,6 @@ static void *run_skin_client(void *arg) %s=%s \ %s=%s \ %s=%d \ -%s=%s \ -%s=%s \ %s", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAVA_LIBRARY_PATH, #ifdef CONFIG_WIN32 @@ -236,8 +228,6 @@ static void *run_skin_client(void *arg) OPT_DISPLAY_SHM, buf_display_shm, buf_input, OPT_BOOLEAN_TRUE, OPT_MAX_TOUCHPOINT, maxtouchpoint, - OPT_PROXY_ADDR, buf_proxy_addr, - OPT_PROXY_PORT, buf_proxy_port, argv); INFO("command for swt : %s\n", cmd); -- 2.34.1