Privilages refactor

This patch moves the privileges.h header from wgt-backend
to app-installer repository. It collects the privileges
definitions to one place.

The following patchsets should be submitted together:
    - https://review.tizen.org/gerrit/72341
    - https://review.tizen.org/gerrit/72342

Change-Id: Ia714e68aafd32117bb5eeafe0a51094244425b8d

diff --git a/src/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt
index 0b4c6d9..ea51011 100644 (file)
--- a/src/wgt/CMakeLists.txt
+++ b/src/wgt/CMakeLists.txt
@@ -1,6 +1,5 @@
 # Target - sources
 SET(SRCS
-  step/common/privileges.cc
   step/configuration/step_parse.cc
   step/encryption/step_encrypt_resources.cc
   step/encryption/step_remove_encryption_data.cc

diff --git a/src/wgt/step/common/privileges.cc b/src/wgt/step/common/privileges.cc
deleted file mode 100644 (file)
index 20b5cc3..0000000
--- a/src/wgt/step/common/privileges.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by a apache 2.0 license that can be
-// found in the LICENSE file.
-
-#include "wgt/step/common/privileges.h"
-
-namespace wgt {
-namespace common {
-namespace privileges {
-const char kImePrivilegeName[] = "http://tizen.org/privilege/ime";
-}  // namespace privileges
-}  // namespace common
-}  // namespace wgt

diff --git a/src/wgt/step/common/privileges.h b/src/wgt/step/common/privileges.h
deleted file mode 100644 (file)
index 5a36ba6..0000000
--- a/src/wgt/step/common/privileges.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by a apache 2.0 license that can be
-// found in the LICENSE file.
-
-#ifndef WGT_STEP_COMMON_PRIVILEGES_H_
-#define WGT_STEP_COMMON_PRIVILEGES_H_
-
-namespace wgt {
-namespace common {
-namespace privileges {
-extern const char kImePrivilegeName[];
-}  // namespace privileges
-}  // namespace common
-}  // namespace wgt
-
-#endif  // WGT_STEP_COMMON_PRIVILEGES_H_

diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
index bfcfb23..6bf7403 100644 (file)
--- a/src/wgt/step/pkgmgr/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.cc
@@ -10,6 +10,7 @@
 
 #include <common/utils/file_util.h>
 #include <common/utils/glist_range.h>
+#include <common/privileges.h>
 
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
@@ -22,7 +23,6 @@
 #include <cstring>
 #include <string>
 
-#include "wgt/step/common/privileges.h"
 #include "wgt/wgt_backend_data.h"
 
 namespace bs = boost::system;

diff --git a/src/wgt/step/security/step_add_default_privileges.cc b/src/wgt/step/security/step_add_default_privileges.cc
index 3cbbe1f..e5e0288 100644 (file)
--- a/src/wgt/step/security/step_add_default_privileges.cc
+++ b/src/wgt/step/security/step_add_default_privileges.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "wgt/step/security/step_add_default_privileges.h"
+#include <common/privileges.h>
 
 #include <pkgmgrinfo_basic.h>
 
@@ -10,13 +11,6 @@
 #include <cstring>
 #include <memory>
 
-namespace {
-
-const char kPrivForWebApp[] =
-    "http://tizen.org/privilege/internal/webappdefault";
-
-}  // namespace
-
 namespace wgt {
 namespace security {
 
@@ -30,7 +24,8 @@ common_installer::Step::Status StepAddDefaultPrivileges::precheck() {
 
 common_installer::Step::Status StepAddDefaultPrivileges::process() {
   manifest_x* m = context_->manifest_data.get();
-  m->privileges = g_list_append(m->privileges, strdup(kPrivForWebApp));
+  m->privileges = g_list_append(m->privileges,
+          strdup(common::privileges::kPrivForWebApp));
   return Status::OK;
 }
 

diff --git a/src/wgt/step/security/step_check_wgt_ime_privilege.cc b/src/wgt/step/security/step_check_wgt_ime_privilege.cc
index 034f0cf..9976852 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_ime_privilege.cc
+++ b/src/wgt/step/security/step_check_wgt_ime_privilege.cc
@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 #include <wgt/step/security/step_check_wgt_ime_privilege.h>
-#include <wgt/step/common/privileges.h>
 
 #include <manifest_parser/utils/version_number.h>
 #include <manifest_parser/utils/logging.h>
 
 #include <common/utils/glist_range.h>
+#include <common/privileges.h>
 
 #include <string>