From: Hwankyu Jhun Date: Mon, 26 Jun 2023 04:46:25 +0000 (+0000) Subject: Revert "Add step that forces private connections in libsyscommon" X-Git-Tag: accepted/tizen/unified/20230627.025436~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9af1764a76be8575fdcaaed2c2bfe2e98ff8c862;p=platform%2Fcore%2Fappfw%2Flaunchpad.git 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 a8ba71f1..67bdb598 100644 --- 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 775348e1..9ef2c676 100644 --- 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 4832ebbe..062173ce 100644 --- 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 951e5e22..1c19ce00 100644 --- a/src/lib/launchpad/step_prepare_execution.cc +++ b/src/lib/launchpad/step_prepare_execution.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -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 eea1c7ef..f95514b8 100644 --- 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 5b92bde7..9dd8db52 100644 --- 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