From fe874224fd9ea73eca6b4885752cc2a9b974f03d Mon Sep 17 00:00:00 2001
From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Thu, 12 Feb 2015 14:53:28 +0900
Subject: [PATCH] build: modified maru_shm library creation on Ubuntu

Change-Id: If1457f138cec3db9b767a7196444df33ed4a8023
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---
 tizen/src/Makefile              | 12 ++++--------
 tizen/src/skin/client/build.xml | 11 ++++++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 87ec3b5..2391f6b 100644
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -115,11 +115,9 @@ util/check_hax.o: %.o: %.c
 # Building java skin
 skin_client:
 ifdef CONFIG_USE_SHM
-	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=false -buildfile skin/client/build.xml make-jar
+	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=true -buildfile skin/client/build.xml make-jar
 else
-ifdef CONFIG_SDL
-	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=true -buildfile skin/client/build.xml make-jar
-endif
+	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false -buildfile skin/client/build.xml make-jar
 endif
 
 build_info:
@@ -222,11 +220,9 @@ endif
 all_dibs: qemu skin_client_dibs
 skin_client_dibs:
 ifdef CONFIG_USE_SHM
-	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotUseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
+	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=true ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
 else
-ifdef CONFIG_SDL
-	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DdoNotNotUseSHM=true ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
-endif
+	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar
 endif
 
 
diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 305116c..44b95c2 100644
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -17,8 +17,6 @@
 		</and>
 	</condition>
 
-	<property name="doNotUseSHM" value="${doNotUseSHM}" />
-
 	<property environment="env" />
 	<property name="jar.file" value="emulator-skin.jar" />
 	<property name="mainclass" value="org.tizen.emulator.skin.EmulatorSkinMain" />
@@ -90,7 +88,14 @@
 		<delete dir="build" />
 	</target>
 
-	<target name="create-native-linux" if="isLinux" unless="doNotUseSHM">
+	<condition property="isLinuxSHM">
+		<and>
+			<isTrue value="${isLinux}" />
+			<isTrue value="${useSHM}" />
+		</and>
+	</condition>
+
+	<target name="create-native-linux" if="${isLinuxSHM}">
 		<echo message="create native shared library on linux..." />
 		<javah destdir="native_src">
 			<classpath refid="classpath" />
-- 
2.7.4