!1439 清理libbegetutil的依赖关系，取出对cJSON的依赖

Merge pull request !1439 from handy/1027

.gitee/ISSUE_TEMPLATE.zh-CN.md

+### 该问题是怎么引起的？
+
+
+
+### 重现步骤
+
+
+
+### 报错信息
+
+
+
+

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

+### 相关的Issue
+
+
+### 原因（目的、解决的问题等）
+
+
+### 描述（做了什么，变更了什么）
+
+
+### 测试用例（新增、改动、可能影响的功能）
+
+
+
+

interfaces/innerkits/BUILD.gn

@@ -27,7 +27,6 @@ config("exported_header_files") {
     "//base/startup/init/interfaces/innerkits/include/syspara",
     "//base/startup/init/interfaces/innerkits/include/fs_manager",
     "//base/startup/init/interfaces/innerkits/include/token",
-    "//base/startup/init/interfaces/innerkits/include/sandbox/include",
     "//base/startup/init/services/include",
   ]
 }
@@ -179,14 +178,12 @@ if (defined(ohos_lite)) {
       "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
       "//base/startup/init/interfaces/innerkits/file:libfile",
       "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
-      "//base/startup/init/interfaces/innerkits/sandbox:sandbox",
       "//base/startup/init/interfaces/innerkits/socket:libsocket",
       "//base/startup/init/services/log:agent_log",
       "//base/startup/init/services/loopevent:loopevent",
       "//base/startup/init/services/param/linux:param_client",
       "//base/startup/init/services/utils:libinit_utils",
       "//third_party/bounds_checking_function:libsec_shared",
-      "//third_party/cJSON:cjson",
       "//third_party/mbedtls:mbedtls_shared",
     ]
     if (use_musl == false) {

services/begetctl/BUILD.gn

@@ -25,7 +25,6 @@ common_include_dirs = [
   "//base/startup/init/services/init/include",
   "//base/startup/init/services/log",
   "//base/startup/init/interfaces/innerkits/include",
-  "//base/startup/init/interfaces/innerkits/sandbox/include",
   "//base/security/selinux/interfaces/policycoreutils/include",
   "//third_party/bounds_checking_function/include",
   "//third_party/selinux/libselinux/include",
@@ -85,6 +84,7 @@ if (defined(ohos_lite)) {
     deps = [
       "//base/startup/init/interfaces/innerkits:libbegetutil",
       "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
+      "//base/startup/init/services/sandbox:sandbox",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
     external_deps = [ "c_utils:utils" ]

services/etc/BUILD.gn

@@ -185,33 +185,6 @@ if (defined(ohos_lite)) {
     subsystem_name = "startup"
   }
 
-  ohos_prebuilt_etc("system-sandbox.json") {
-    if (target_cpu == "arm64") {
-      source = "//base/startup/init/interfaces/innerkits/sandbox/system-sandbox64.json"
-    } else {
-      source =
-          "//base/startup/init/interfaces/innerkits/sandbox/system-sandbox.json"
-    }
-    output =
-        "//base/startup/init/interfaces/innerkits/sandbox/system-sandbox.json"
-    part_name = "init"
-    subsystem_name = "startup"
-    module_install_dir = "etc/sandbox"
-  }
-
-  ohos_prebuilt_etc("chipset-sandbox.json") {
-    if (target_cpu == "arm64") {
-      source = "//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox64.json"
-    } else {
-      source = "//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox.json"
-    }
-    output =
-        "//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox.json"
-    part_name = "init"
-    subsystem_name = "startup"
-    module_install_dir = "etc/sandbox"
-  }
-
   ohos_prebuilt_etc("init.reboot") {
     source = "//base/startup/init/services/etc/init.reboot.cfg"
     part_name = "init"
@@ -222,7 +195,6 @@ if (defined(ohos_lite)) {
   group("etc_files") {
     deps = [
       ":boot.group",
-      ":chipset-sandbox.json",
       ":console.cfg",
       ":features.json",
       ":group",
@@ -236,7 +208,6 @@ if (defined(ohos_lite)) {
       ":passwd",
       ":syscap.json",
       ":syscap.para",
-      ":system-sandbox.json",
       ":systemcapability.json",
       ":ueventd.cfg",
     ]

services/init/standard/BUILD.gn

@@ -64,9 +64,9 @@ ohos_executable("init") {
     "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
     "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
     "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
-    "//base/startup/init/interfaces/innerkits/sandbox:sandbox",
     "//base/startup/init/services/loopevent:loopevent",
     "//base/startup/init/services/param/linux:param_init",
+    "//base/startup/init/services/sandbox:sandbox",
     "//base/startup/init/services/utils:libinit_utils",
   ]
   if (use_musl == false) {

interfaces/innerkits/sandbox/BUILD.gn → services/sandbox/BUILD.gn

@@ -17,7 +17,7 @@ import("//build/ohos.gni")
 config("exported_header_files") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//base/startup/init/interfaces/innerkits/sandbox/include",
+    "./include",
     "//base/customization/config_policy/interfaces/inner_api/include",
   ]
 }
@@ -32,11 +32,39 @@ ohos_static_library("sandbox") {
     "//third_party/bounds_checking_function/include",
     "//base/startup/init/services/include",
     "//base/startup/init/interfaces/innerkits/include",
-    "//third_party/cJSON",
   ]
+  public_deps = [ "//third_party/cJSON:cjson" ]
   if (target_cpu == "arm64") {
     defines = [ "SUPPORT_64BIT" ]
   }
+  deps = [
+    ":chipset-sandbox.json",
+    ":system-sandbox.json",
+  ]
+  part_name = "init"
+  subsystem_name = "startup"
+}
+
+ohos_prebuilt_etc("system-sandbox.json") {
+  if (target_cpu == "arm64") {
+    source = "system-sandbox64.json"
+  } else {
+    source = "system-sandbox.json"
+  }
+  output = "//base/startup/init/services/sandbox/system-sandbox.json"
+  part_name = "init"
+  subsystem_name = "startup"
+  module_install_dir = "etc/sandbox"
+}
+
+ohos_prebuilt_etc("chipset-sandbox.json") {
+  if (target_cpu == "arm64") {
+    source = "chipset-sandbox64.json"
+  } else {
+    source = "chipset-sandbox.json"
+  }
+  output = "//base/startup/init/services/sandbox/chipset-sandbox.json"
   part_name = "init"
   subsystem_name = "startup"
+  module_install_dir = "etc/sandbox"
 }

test/unittest/BUILD.gn

@@ -38,8 +38,6 @@ ohos_unittest("init_unittest") {
     "//base/startup/init/interfaces/innerkits/fs_manager/fstab.c",
     "//base/startup/init/interfaces/innerkits/fs_manager/fstab_mount.c",
     "//base/startup/init/interfaces/innerkits/reboot/init_reboot_innerkits.c",
-    "//base/startup/init/interfaces/innerkits/sandbox/sandbox.c",
-    "//base/startup/init/interfaces/innerkits/sandbox/sandbox_namespace.c",
     "//base/startup/init/interfaces/innerkits/socket/init_socket.c",
     "//base/startup/init/interfaces/innerkits/syspara/param_comm.c",
     "//base/startup/init/interfaces/innerkits/syspara/parameter.c",
@@ -100,6 +98,8 @@ ohos_unittest("init_unittest") {
     "//base/startup/init/services/param/trigger/trigger_checker.c",
     "//base/startup/init/services/param/trigger/trigger_manager.c",
     "//base/startup/init/services/param/trigger/trigger_processor.c",
+    "//base/startup/init/services/sandbox/sandbox.c",
+    "//base/startup/init/services/sandbox/sandbox_namespace.c",
     "//base/startup/init/services/utils/init_hashmap.c",
     "//base/startup/init/services/utils/init_utils.c",
     "//base/startup/init/services/utils/list.c",
@@ -219,7 +219,7 @@ ohos_unittest("init_unittest") {
     "//third_party/cJSON",
     "//base/security/access_token/interfaces/innerkits/token_setproc/include",
     "//base/security/access_token/interfaces/innerkits/nativetoken/include",
-    "//base/startup/init/interfaces/innerkits/sandbox/include",
+    "//base/startup/init/services/sandbox/include",
     "//base/startup/init/interfaces/innerkits/hals",
     "${FSCRYPT_PATH}/include/libfscrypt",
   ]