Revert "Add step that forces private connections in libsyscommon"

This reverts commit 563653568fd889ea2c12f786a34d18231c53901c.

Change-Id: Ib47f2747a6026337472a18aef61c8457a2747e0d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8ba71f18ca64ab6ae47418109ae7b93b626f44e..67bdb598486d73bb9997b95ed2273f63928191fd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ PKG_CHECK_MODULES(DLOG_REDIRECT_STDOUT_DEPS REQUIRED dlog-redirect-stdout)
 PKG_CHECK_MODULES(ECORE_CORE_DEPS REQUIRED ecore-core)
 PKG_CHECK_MODULES(ECORE_DEPS REQUIRED ecore)
 PKG_CHECK_MODULES(ELEMENTARY_DEPS REQUIRED elementary)
-PKG_CHECK_MODULES(GIO_DEPS REQUIRED gio-2.0 gio-unix-2.0)
+PKG_CHECK_MODULES(GIO_DEPS REQUIRED gio-2.0)
 PKG_CHECK_MODULES(GMOCK_DEPS REQUIRED gmock)
 PKG_CHECK_MODULES(INIPARSER_DEPS REQUIRED iniparser)
 PKG_CHECK_MODULES(LIBCAP_DEPS REQUIRED libcap)
@@ -75,7 +75,6 @@ PKG_CHECK_MODULES(TANCHOR_DEPS REQUIRED tanchor)
 PKG_CHECK_MODULES(TIZEN_SHARED_QUEUE_DEPS REQUIRED tizen-shared-queue)
 PKG_CHECK_MODULES(TTRACE_DEPS REQUIRED ttrace)
 PKG_CHECK_MODULES(VCONF_DEPS REQUIRED vconf)
-PKG_CHECK_MODULES(LIBSYSCOMMON_DEPS REQUIRED libsyscommon)
 
 ENABLE_TESTING()
 ADD_TEST(NAME ${TARGET_LAUNCHPAD_PROCESS_POOL_UNITTEST}

diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec
index 775348e1b65cde58d6b96003b59625f95d2565b1..9ef2c67625575275c69d2bcf5942d67e95f75092 100644 (file)
--- a/packaging/launchpad.spec
+++ b/packaging/launchpad.spec
@@ -23,13 +23,11 @@ BuildRequires:  pkgconfig(dlog-redirect-stdout)
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gmock)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(libsyscommon)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(parcel)

diff --git a/src/launchpad-process-pool/CMakeLists.txt b/src/launchpad-process-pool/CMakeLists.txt
index 4832ebbe80742a2aa27aaa8bd11fbea66991f605..062173ce292d0c0149b8c22c4d4891604408686b 100644 (file)
--- a/src/launchpad-process-pool/CMakeLists.txt
+++ b/src/launchpad-process-pool/CMakeLists.txt
@@ -37,7 +37,6 @@ APPLY_PKG_CONFIG(${TARGET_LAUNCHPAD_PROCESS_POOL} PUBLIC
   LIBCAP_DEPS
   LIBSMACK_DEPS
   LIBSYSTEMD_DEPS
-  LIBSYSCOMMON_DEPS
   LIBTZPLATFORM_CONFIG_DEPS
   SECURITY_MANAGER_DEPS
   TANCHOR_DEPS

diff --git a/src/lib/launchpad/step_prepare_execution.cc b/src/lib/launchpad/step_prepare_execution.cc
index 951e5e228259e6acb2e18475bd599c8842bbd35c..1c19ce00cc0c80ffcf97f4ceb90b4d1bf21d9ede 100644 (file)
--- a/src/lib/launchpad/step_prepare_execution.cc
+++ b/src/lib/launchpad/step_prepare_execution.cc
@@ -20,7 +20,6 @@
 #include <bundle_cpp.h>
 #include <bundle_internal.h>
 #include <buxton2.h>
-#include <libsyscommon/libgdbus.h>
 #include <security-manager.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
@@ -62,8 +61,6 @@ StepPrepareExecution::StepPrepareExecution() {
         std::placeholders::_1),
     std::bind(&StepPrepareExecution::PrepareIdFile, this,
         std::placeholders::_1),
-    std::bind(&StepPrepareExecution::LibsyscommonSwitchToPrivateConn, this,
-        std::placeholders::_1),
     std::bind(&StepPrepareExecution::SendStartupSignal, this,
         std::placeholders::_1),
   };
@@ -192,11 +189,6 @@ int StepPrepareExecution::PrepareIdFile(AppInfo* app_info) {
   return 0;
 }
 
-int StepPrepareExecution::LibsyscommonSwitchToPrivateConn(AppInfo* app_info) {
-  _I("Switching to private connection.");
-  return gdbus_switch_to_private_connection();
-}
-
 int StepPrepareExecution::SendStartupSignal(AppInfo* app_info) {
   if (Util::SendCmdToAmd(AmdCmd::AppStartupSignal) != 0)
     _W("Failed to send startup signal");

diff --git a/src/lib/launchpad/step_prepare_execution.hh b/src/lib/launchpad/step_prepare_execution.hh
index eea1c7ef874001b95123671d774a946b95c41905..f95514b86c8f0846f318091b5905d8c00cf5339a 100644 (file)
--- a/src/lib/launchpad/step_prepare_execution.hh
+++ b/src/lib/launchpad/step_prepare_execution.hh
@@ -43,7 +43,6 @@ class StepPrepareExecution {
   int WaitTepMount(AppInfo* app_info);
   int PrepareAppSocket(AppInfo* app_info);
   int PrepareIdFile(AppInfo* app_info);
-  int LibsyscommonSwitchToPrivateConn(AppInfo* app_info);
   int SendStartupSignal(AppInfo* app_info);
 
  private:

diff --git a/tests/launchpad-process-pool-unittest/CMakeLists.txt b/tests/launchpad-process-pool-unittest/CMakeLists.txt
index 5b92bde7bb41afe70b195c8f82d827f47c9a4b33..9dd8db52985fa837ecb0dd9f1e4c3957bbe22c62 100644 (file)
--- a/tests/launchpad-process-pool-unittest/CMakeLists.txt
+++ b/tests/launchpad-process-pool-unittest/CMakeLists.txt
@@ -33,7 +33,6 @@ APPLY_PKG_CONFIG(${TARGET_LAUNCHPAD_PROCESS_POOL_UNITTEST} PUBLIC
   INIPARSER_DEPS
   LIBCAP_DEPS
   LIBSMACK_DEPS
-  LIBSYSCOMMON_DEPS
   LIBSYSTEMD_DEPS
   LIBTZPLATFORM_CONFIG_DEPS
   SECURITY_MANAGER_DEPS