From eaf100f2bde807947ca2df99d804a1d5f94604cd Mon Sep 17 00:00:00 2001
From: Piotr Dabrowski <p.dabrowski2@samsung.com>
Date: Fri, 16 Dec 2016 15:16:37 +0100
Subject: [PATCH] Create private tmp directory in skel

Submit together:
https://review.tizen.org/gerrit/#/c/105467/
https://review.tizen.org/gerrit/#/c/105468/

Change-Id: I7454b05b3d83bac2939594f0d82e8d22d457789c
---
 src/hybrid/hybrid_installer.cc | 13 +++++++++----
 src/hybrid/shared_dirs.h       | 20 ++++++++++++++++++++
 src/wgt/shared_dirs.h          | 20 ++++++++++++++++++++
 src/wgt/wgt_installer.cc       | 13 +++++++++----
 4 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 src/hybrid/shared_dirs.h
 create mode 100644 src/wgt/shared_dirs.h

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index ccdd3f7..ed90220 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "hybrid/hybrid_installer.h"
+#include "hybrid/shared_dirs.h"
 
 #include <common/privileges.h>
 #include <common/step/backup/step_backup_icons.h>
@@ -141,7 +142,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
@@ -337,7 +339,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
@@ -411,7 +414,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
@@ -460,7 +464,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
     }
diff --git a/src/hybrid/shared_dirs.h b/src/hybrid/shared_dirs.h
new file mode 100644
index 0000000..a6a4683
--- /dev/null
+++ b/src/hybrid/shared_dirs.h
@@ -0,0 +1,20 @@
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef HYBRID_SHARED_DIRS_H_
+#define HYBRID_SHARED_DIRS_H_
+
+#include <vector>
+
+namespace wgt {
+namespace filesystem {
+
+const std::vector<const char*> HybridAdditionalSharedDirs = {
+  {"tmp"},
+};
+
+}  // namespace filesystem
+}  // namespace wgt
+
+#endif  // HYBRID_SHARED_DIRS_H_
diff --git a/src/wgt/shared_dirs.h b/src/wgt/shared_dirs.h
new file mode 100644
index 0000000..2b75e91
--- /dev/null
+++ b/src/wgt/shared_dirs.h
@@ -0,0 +1,20 @@
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef HYBRID_SHARED_DIRS_H_
+#define HYBRID_SHARED_DIRS_H_
+
+#include <vector>
+
+namespace wgt {
+namespace filesystem {
+
+const std::vector<const char*> WgtAdditionalSharedDirs = {
+  {"tmp"},
+};
+
+}  // namespace filesystem
+}  // namespace wgt
+
+#endif  // HYBRID_SHARED_DIRS_H_
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 5929586..cef4e4c 100755
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "wgt/wgt_installer.h"
+#include "wgt/shared_dirs.h"
 
 #include <common/pkgmgr_interface.h>
 
@@ -146,7 +147,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
@@ -348,7 +350,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepCreateIcons>();
       AddStep<wgt::filesystem::StepCopyPreviewIcons>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<wgt::security::StepCheckExtensionPrivileges>();
       AddStep<ci::security::StepRegisterSecurity>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
@@ -420,7 +423,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::security::StepRegisterSecurity>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
@@ -532,7 +536,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::security::StepRegisterSecurity>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+          wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
       break;
     }
-- 
2.7.4