From: Sangho Park <sangho1206.park@samsung.com>
Date: Wed, 11 Mar 2015 03:08:51 +0000 (+0900)
Subject: Merge changes Ia212f4f8,Ifaf6f246,Ica22d3b7,I5039e19e into tizen_2.4
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~548
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=675f13b35ef2a358d0b23f7e9869bfafedbea94f;p=sdk%2Femulator%2Fqemu.git

Merge changes Ia212f4f8,Ifaf6f246,Ica22d3b7,I5039e19e into tizen_2.4

* changes:
  Build: Modified build script.
  package: modified skin packaging
  keyboard: deleted conditional codes to check host keyboard state
  menu: disable host keyboard menu on mobile
---

675f13b35ef2a358d0b23f7e9869bfafedbea94f
diff --cc package/build.ubuntu-32
index 77472368b2,007606e3f8..acd648b785
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@@ -87,10 -88,9 +89,11 @@@ install(
  	mkdir -p $X86_BIN_DIR
  #	mkdir -p $ARM_BIN_DIR
  	mkdir -p $COMMON_BIN_DIR
- 	mkdir -p $MOBILE_3_0_SKIN_RESOURCE_DIR
+ 	mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
+ 	mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
  
 +	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib
 +
  	cd $SRCDIR/tizen
  	make install_dibs
  
diff --cc package/build.ubuntu-64
index 77472368b2,007606e3f8..acd648b785
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@@ -87,10 -88,9 +89,11 @@@ install(
  	mkdir -p $X86_BIN_DIR
  #	mkdir -p $ARM_BIN_DIR
  	mkdir -p $COMMON_BIN_DIR
- 	mkdir -p $MOBILE_3_0_SKIN_RESOURCE_DIR
+ 	mkdir -p $MOBILE_2_4_SKIN_RESOURCE_DIR
+ 	mkdir -p $WEARABLE_2_4_SKIN_RESOURCE_DIR
  
 +	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib
 +
  	cd $SRCDIR/tizen
  	make install_dibs