Revert "Add dev_wos build option for permissive mode"

This reverts commit 1ae82ce956826536a15bc4c6c248959f40db2ae7.

Change-Id: Iaae28227aba3111d9cc614ccdfb8791c14e10cb1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7738702bcc0d2e809c76f89b4026786c5e1bca1..f7c34172c36d2bd38ab567f6120a4282f2e3bba6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,13 +21,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_C_FLAGS} -fPIC")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
-IF(_TIZEN_FEATURE_SMACK_DISABLE)
-MESSAGE(STATUS "[SMACK] Disable")
-ADD_DEFINITIONS("-DTIZEN_FEATURE_SMACK_DISABLE")
-ELSE(_TIZEN_FEATURE_SMACK_DISABLE)
-MESSAGE(STATUS "[SMACK] Enable")
-ENDIF(_TIZEN_FEATURE_SMACK_DISABLE)
-
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 

diff --git a/packaging/capi-appfw-app-manager.spec b/packaging/capi-appfw-app-manager.spec
index 55bcda73e65013b220a8cffa85c5ba120d14c89d..c69f998620be59913343bf87d3c2d985e712c855 100644 (file)
--- a/packaging/capi-appfw-app-manager.spec
+++ b/packaging/capi-appfw-app-manager.spec
@@ -53,12 +53,6 @@ Group:    Application Framework/API
 gcov objects for an application manager library
 %endif
 
-%if "%{?dev_wos}" == "1"
-%define tizen_feature_smack_disable 1
-%else
-%define tizen_feature_smack_disable 0
-%endif
-
 %prep
 %setup -q
 
@@ -71,15 +65,8 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 export LDFLAGS+=" -lgcov"
 %endif
 
-%if 0%{?tizen_feature_smack_disable}
-_TIZEN_FEATURE_SMACK_DISABLE=ON
-%endif
-
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake -DFULLVER=%{version} \
-       -DMAJORVER=${MAJORVER} \
-       -D_TIZEN_FEATURE_SMACK_DISABLE:BOOL=${_TIZEN_FEATURE_SMACK_DISABLE} \
-       .
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %__make %{?jobs:-j%jobs}
 
 %check

diff --git a/src/app_info.c b/src/app_info.c
index c2acdb93070fd5383af0ae0cfd97a81d9599cf14..7315591f785f65854f08defda5cf0a74770552af 100644 (file)
--- a/src/app_info.c
+++ b/src/app_info.c
@@ -296,7 +296,6 @@ int app_info_foreach_app_info(app_manager_app_info_cb callback, void *user_data)
        return APP_MANAGER_ERROR_NONE;
 }
 
-#ifndef TIZEN_FEATURE_SMACK_DISABLE
 static int _check_privilege(char *privilege)
 {
        cynara *p_cynara;
@@ -348,7 +347,6 @@ out:
 
        return ret;
 }
-#endif /* TIZEN_FEATURE_SMACK_DISABLE */
 
 static void __app_context_initialize(void)
 {
@@ -779,11 +777,9 @@ API int app_info_foreach_category(app_info_h app_info, app_info_category_cb call
        if (app_info == NULL || callback == NULL)
                return app_manager_error(APP_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
 
-#ifndef TIZEN_FEATURE_SMACK_DISABLE
        retval = _check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
        if (retval != APP_MANAGER_ERROR_NONE)
                return app_manager_error(APP_MANAGER_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL);
-#endif /* TIZEN_FEATURE_SMACK_DISABLE */
 
        foreach_category_context_s foreach_category = {
                .callback = callback,

diff --git a/tests/app-manager_unittests/app_info_tests.cc b/tests/app-manager_unittests/app_info_tests.cc
index 048de70562623fa85e6e325419b10404df490edc..00e36816a8ccd39a61d4b17e3dc759771e8d6fe6 100644 (file)
--- a/tests/app-manager_unittests/app_info_tests.cc
+++ b/tests/app-manager_unittests/app_info_tests.cc
@@ -632,7 +632,6 @@ TEST_F(AppInfoTest, app_info_clone_N) {
 }
 
 TEST_F(AppInfoTest, app_info_foreach_category_P) {
-#ifndef TIZEN_FEATURE_SMACK_DISABLE
   EXPECT_CALL(GetMock<CynaraMock>(), cynara_check(_, _, _, _, _))
       .WillOnce(Invoke(
           [&](cynara* p_cynara, const char* client, const char* client_session,
@@ -641,7 +640,6 @@ TEST_F(AppInfoTest, app_info_foreach_category_P) {
       }));
   EXPECT_CALL(GetMock<CynaraMock>(), cynara_creds_self_get_client(_, _))
       .WillOnce(Return(0));
-#endif /* TIZEN_FEATURE_SMACK_DISABLE */
   EXPECT_CALL(GetMock<PkgmgrInfoMock>(),
               pkgmgrinfo_appinfo_foreach_category(_, _, _))
       .WillOnce(Invoke([&](pkgmgrinfo_appinfo_h handle,