Remove unnecessary macrotizen_4.0.m1_releasesubmit/tizen_unified/20170308.100405submit/tizen_4.0_unified/20170814.115522submit/tizen_4.0/20170828.100002submit/tizen_4.0/20170814.115522submit/tizen_4.0/20170811.094300submit/tizen_3.0_wearable/20161015.000001submit/tizen_3.0_tv/20161015.000001submit/tizen_3.0_mobile/20161015.000001submit/tizen_3.0_ivi/20161010.000001submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093749submit/tizen/20160919.055034accepted/tizen/wearable/20160919.232033accepted/tizen/unified/20170309.031927accepted/tizen/tv/20160919.232020accepted/tizen/mobile/20160919.231955accepted/tizen/ivi/20160919.232048accepted/tizen/common/20160919.154553accepted/tizen/4.0/unified/20170828.223810accepted/tizen/4.0/unified/20170816.020204accepted/tizen/4.0/unified/20170816.013800accepted/tizen/3.0/wearable/20161015.081934accepted/tizen/3.0/tv/20161016.004039accepted/tizen/3.0/mobile/20161015.032628accepted/tizen/3.0/ivi/20161011.043748accepted/tizen/3.0/common/20161114.105409accepted/tizen/3.0.m2/wearable/20170104.122954accepted/tizen/3.0.m2/tv/20170104.122629accepted/tizen/3.0.m2/mobile/20170104.121852tizen_4.0tizen_3.0_tvtizen_3.0.m2tizen_3.0accepted/tizen_wearableaccepted/tizen_unifiedaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_4.0_unifiedaccepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile

Change-Id: Ic67d98795b3c3329de7fd1697f216f9a670853df
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

3 files changed, 1 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f68928..6d53dce 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,11 +19,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 # Set required packages
 INCLUDE(FindPkgConfig)
 
-SET(pkgs_requires "dlog glib-2.0 gio-2.0 bundle vconf security-manager")
-IF(_APPFW_FEATURE_SOCKET_ACTIVATION)
-	SET(pkgs_requires "${pkgs_requires} libsystemd-daemon")
-	ADD_DEFINITIONS("-D_APPFW_FEATURE_SOCKET_ACTIVATION")
-ENDIF(_APPFW_FEATURE_SOCKET_ACTIVATION)
+SET(pkgs_requires "dlog glib-2.0 gio-2.0 bundle vconf security-manager libsystemd-daemon")
 
 pkg_check_modules(pkgs REQUIRED ${pkgs_requires})
 
diff --git a/packaging/debug-launchpad.spec b/packaging/debug-launchpad.spec
index 491df68..6300e02 100755
--- a/packaging/debug-launchpad.spec
+++ b/packaging/debug-launchpad.spec
@@ -24,8 +24,6 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(security-manager)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 
-%define appfw_feature_socket_activation 1
-
 %description
 Debug launchpad
 
@@ -38,7 +36,6 @@ _APPFW_FEATURE_SOCKET_ACTIVATION=ON
 %endif
 
 cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-D_APPFW_FEATURE_SOCKET_ACTIVATION:BOOL=${_APPFW_FEATURE_SOCKET_ACTIVATION} \
 	.
 
 make %{?jobs:-j%jobs}
@@ -47,12 +44,10 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-%if 0%{?appfw_feature_socket_activation}
 mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
 install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir_user}/debug-launchpad.service
 install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir_user}/debug-launchpad.socket
 ln -s ../debug-launchpad.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/debug-launchpad.socket
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -63,8 +58,6 @@ rm -rf %{buildroot}
 %license LICENSE
 %manifest debug-launchpad.manifest
 %caps(cap_mac_admin,cap_setgid,cap_dac_override=ei) %{_bindir}/debug_launchpad_preloading_preinitializing_daemon
-%if 0%{?appfw_feature_socket_activation}
 %{_unitdir_user}/debug-launchpad.service
 %{_unitdir_user}/debug-launchpad.socket
 %{_unitdir_user}/sockets.target.wants/debug-launchpad.socket
-%endif
diff --git a/src/common.c b/src/common.c
index c6b121a..b64ea5f 100644
--- a/src/common.c
+++ b/src/common.c
@@ -31,9 +31,7 @@
 #include <unistd.h>
 #include <bundle.h>
 #include <bundle_internal.h>
-#ifdef _APPFW_FEATURE_SOCKET_ACTIVATION
 #include <systemd/sd-daemon.h>
-#endif /* _APPFW_FEATURE_SOCKET_ACTIVATION */
 
 #include "common.h"
 #include "debug_util.h"
@@ -57,7 +55,6 @@ static void __set_sock_option(int fd, int cli)
 		setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
 }
 
-#ifdef _APPFW_FEATURE_SOCKET_ACTIVATION
 static int __create_sock_activation(void)
 {
 	int listen_fds;
@@ -72,7 +69,6 @@ static int __create_sock_activation(void)
 
 	return -1;
 }
-#endif /* _APPFW_FEATURE_SOCKET_ACTIVATION */
 
 static int __create_server_socket(bool is_app)
 {
@@ -159,9 +155,7 @@ int _create_server_sock(void)
 {
 	int fd = -1;
 
-#ifdef _APPFW_FEATURE_SOCKET_ACTIVATION
 	fd = __create_sock_activation();
-#endif /* _APPFW_FEATURE_SOCKET_ACTIAVTION */
 	if (fd < 0) {
 		fd = __create_server_socket(false);
 		if (fd < 0) {