From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 21 Jul 2015 05:46:05 +0000 (+0900)
Subject: Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~289
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c2aed009d0a2d0fc6acff3bc01b8909387e591b;p=sdk%2Femulator%2Fqemu.git

Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Conflicts:
	tizen/src/emulator_legacy.c

Change-Id: I2bf2ad9d2bf8a91644bf4ac35d84436d372e51b5
---

4c2aed009d0a2d0fc6acff3bc01b8909387e591b
diff --cc tizen/src/Makefile
index 7827a75879,5211a93751..3349ad6a53
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@@ -269,9 -267,9 +269,10 @@@ ifdef CONFIG_USE_SH
  else
  	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
  endif
+ endif
  
  install_dibs: all_dibs
 +# we care about only x86_64 in DIBS now
  	mkdir -p $(DIBS_COMMON_DIR)/bin
  	mkdir -p $(DIBS_COMMON_DIR)/etc
  	mkdir -p $(DIBS_COMMON_DIR)/icons