Set the architecture info for Unity app

Change-Id: Ibd103dbf6035bcbb8bf240f72ad67a34f1a55974
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8baac20..5ecb214 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,9 @@ ENDIF(_TIZEN_FEATURE_PRIORITY_CHANGE)
 IF(_TIZEN_FEATURE_LOADER_PRIORITY)
        ADD_DEFINITIONS("-DTIZEN_FEATURE_LOADER_PRIORITY")
 ENDIF(_TIZEN_FEATURE_LOADER_PRIORITY)
+IF(_TIZEN_FEATURE_SET_PERSONALITY_32)
+       ADD_DEFINITIONS("-DTIZEN_FEATURE_SET_PERSONALITY_32")
+ENDIF(_TIZEN_FEATURE_SET_PERSONALITY_32)
 
 ADD_DEFINITIONS("-DLAUNCHPAD_LOG")
 ADD_DEFINITIONS("-DPRELOAD_ACTIVATE")

diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec
index 131e4d9..c2bf8c6 100644 (file)
--- a/packaging/launchpad.spec
+++ b/packaging/launchpad.spec
@@ -32,6 +32,11 @@ Requires(preun): /usr/bin/systemctl
 
 %define tizen_feature_priority_change 0
 %define tizen_feature_loader_priority 0
+%ifarch armv7l i586
+%define tizen_arch32 1
+%else
+%define tizen_arch32 0
+%endif
 
 %description
 Launchpad for launching applications
@@ -66,12 +71,16 @@ _TIZEN_FEATURE_PRIORITY_CHANGE=ON
 %if 0%{?tizen_feature_loader_priority}
 _TIZEN_FEATURE_LOADER_PRIORITY=ON
 %endif
+%if 0%{?tizen_arch32}
+_TIZEN_FEATURE_SET_PERSONALITY_32=ON
+%endif
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake -DVERSION=%{version} \
        -DMAJORVER=${MAJORVER} \
        -D_TIZEN_FEATURE_PRIORITY_CHANGE:BOOL=${_TIZEN_FEATURE_PRIORITY_CHANGE} \
        -D_TIZEN_FEATURE_LOADER_PRIORITY:BOOL=${_TIZEN_FEATURE_LOADER_PRIORITY} \
+       -D_TIZEN_FEATURE_SET_PERSONALITY_32:BOOL=${_TIZEN_FEATURE_SET_PERSONALITY_32} \
        .
 %__make %{?_smp_mflags}
 

diff --git a/src/launchpad_common.c b/src/launchpad_common.c
index e92e053..89fcadb 100644 (file)
--- a/src/launchpad_common.c
+++ b/src/launchpad_common.c
@@ -36,6 +36,7 @@
 #include <systemd/sd-journal.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/personality.h>
 
 #include "launchpad_common.h"
 #include "key.h"
@@ -686,6 +687,15 @@ void _set_env(appinfo_t *menu_info, bundle *kb)
 
        snprintf(buf, sizeof(buf), "%d", getpid());
        setenv("AUL_PID", buf, 1);
+
+#ifdef TIZEN_FEATURE_SET_PERSONALITY_32
+       int res = personality(PER_LINUX32);
+
+       if (res < 0) {
+               _E("personality() failed,  error: %d (%s)",
+                               errno, strerror(errno));
+       }
+#endif
 }
 
 char **_create_argc_argv(bundle *kb, int *margc)