!2087 init---修改selinux仓名

Merge pull request !2087 from steven_Q/master

bundle.json

@@ -39,7 +39,7 @@
                 "thirdparty_bounds_checking_function",
                 "samgr",
                 "hiviewdfx_hilog_native",
-                "selinux",
+                "selinux_adapter",
                 "hiviewdfx",
                 "access_token",
                 "common",

services/begetctl/BUILD.gn

@@ -26,7 +26,7 @@ common_include_dirs = [
   "//base/startup/init/services/log",
   "//base/startup/init/interfaces/innerkits/include",
   "//base/startup/init/interfaces/innerkits/include/syspara",
-  "//base/security/selinux/interfaces/policycoreutils/include",
+  "//base/security/selinux_adapter/interfaces/policycoreutils/include",
   "//third_party/bounds_checking_function/include",
   "//third_party/selinux/libselinux/include",
 ]
@@ -113,7 +113,7 @@ if (defined(ohos_lite)) {
 
     if (build_selinux) {
       deps += [
-        "//base/security/selinux:libselinux_parameter_static",
+        "//base/security/selinux_adapter:libselinux_parameter_static",
         "//third_party/selinux:libselinux",
       ]
       defines += [ "PARAM_SUPPORT_SELINUX" ]
@@ -158,7 +158,7 @@ if (defined(ohos_lite)) {
 
     if (build_selinux) {
       deps += [
-        "//base/security/selinux:libselinux_parameter_static",
+        "//base/security/selinux_adapter:libselinux_parameter_static",
         "//third_party/selinux:libselinux",
       ]
       defines += [ "PARAM_SUPPORT_SELINUX" ]
@@ -210,7 +210,7 @@ if (defined(ohos_lite)) {
     ]
     if (build_selinux) {
       deps += [
-        "//base/security/selinux:libselinux_parameter_static",
+        "//base/security/selinux_adapter:libselinux_parameter_static",
         "//third_party/selinux:libselinux",
       ]
       defines += [ "PARAM_SUPPORT_SELINUX" ]

services/init/standard/BUILD.gn

@@ -107,12 +107,12 @@ ohos_executable("init") {
   if (build_selinux) {
     include_dirs += [
       "//third_party/selinux/libselinux/include/",
-      "//base/security/selinux/interfaces/policycoreutils/include/",
+      "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
     ]
     deps += [ "//third_party/selinux:libselinux" ]
     external_deps += [
-      "selinux:libload_policy",
-      "selinux:librestorecon",
+      "selinux_adapter:libload_policy",
+      "selinux_adapter:librestorecon",
     ]
     cflags += [ "-DWITH_SELINUX" ]
   }

services/modules/bootevent/BUILD.gn

@@ -33,7 +33,7 @@ ohos_source_set("libbootevent_static") {
   if (build_selinux) {
     include_dirs += [
       "//third_party/selinux/libselinux/include/",
-      "//base/security/selinux/interfaces/policycoreutils/include/",
+      "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
       "//base/startup/init/services/include/param",
     ]
     defines = [ "WITH_SELINUX" ]

services/modules/init_context/BUILD.gn

@@ -34,8 +34,8 @@ ohos_shared_library("init_context") {
   defines = [ "INIT_SUPPORT_CHIPSET_INIT" ]
   if (build_selinux) {
     external_deps += [
-      "selinux:libload_policy",
-      "selinux:librestorecon",
+      "selinux_adapter:libload_policy",
+      "selinux_adapter:librestorecon",
     ]
     defines += [ "WITH_SELINUX" ]
   }

services/modules/init_hook/BUILD.gn

@@ -52,7 +52,7 @@ if (defined(ohos_lite)) {
     if (build_selinux) {
       include_dirs += [
         "//third_party/selinux/libselinux/include/",
-        "//base/security/selinux/interfaces/policycoreutils/include/",
+        "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
       ]
       defines += [ "WITH_SELINUX" ]
     }

services/modules/selinux/BUILD.gn

@@ -23,7 +23,7 @@ ohos_shared_library("selinuxadp") {
     "../init_hook",
     "//base/startup/init/services/include/param",
     "//third_party/selinux/libselinux/include/",
-    "//base/security/selinux/interfaces/policycoreutils/include/",
+    "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
   ]
   deps = [
     "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
@@ -32,8 +32,8 @@ ohos_shared_library("selinuxadp") {
   ]
 
   external_deps = [
-    "selinux:libload_policy",
-    "selinux:librestorecon",
+    "selinux_adapter:libload_policy",
+    "selinux_adapter:librestorecon",
   ]
 
   part_name = "init"
@@ -62,7 +62,7 @@ ohos_source_set("libselinuxadp_static") {
     "../init_hook",
     "//base/startup/init/services/include/param",
     "//third_party/selinux/libselinux/include/",
-    "//base/security/selinux/interfaces/policycoreutils/include/",
+    "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
   ]
   public_configs = [ ":selinux_static_config" ]
   public_configs += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]

services/param/base/BUILD.gn

@@ -134,7 +134,7 @@ if (defined(ohos_lite)) {
     if (build_selinux) {
       include_dirs += [
         "//third_party/selinux/libselinux/include/",
-        "//base/security/selinux/interfaces/policycoreutils/include/",
+        "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
       ]
       sources +=
           [ "//base/startup/init/services/param/adapter/param_selinux.c" ]
@@ -142,7 +142,7 @@ if (defined(ohos_lite)) {
         "PARAM_SUPPORT_SELINUX",
         "PARAMWORKSPACE_NEED_MUTEX",
       ]
-      deps += [ "//base/security/selinux:libselinux_parameter_static" ]
+      deps += [ "//base/security/selinux_adapter:libselinux_parameter_static" ]
     }
     if (param_base_log) {
       defines += [ "PARAM_BASE_LOG" ]
@@ -166,13 +166,13 @@ if (defined(ohos_lite)) {
     if (build_selinux) {
       include_dirs += [
         "//third_party/selinux/libselinux/include/",
-        "//base/security/selinux/interfaces/policycoreutils/include/",
+        "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
       ]
       defines += [
         "PARAM_SUPPORT_SELINUX",
         "PARAMWORKSPACE_NEED_MUTEX",
       ]
-      deps += [ "//base/security/selinux:libselinux_parameter_static" ]
+      deps += [ "//base/security/selinux_adapter:libselinux_parameter_static" ]
     }
     if (param_base_log) {
       defines += [ "PARAM_BASE_LOG" ]

services/param/linux/BUILD.gn

@@ -40,7 +40,7 @@ param_include_dirs = [
   "//third_party/bounds_checking_function/include",
   "//third_party/cJSON",
   "//commonlibrary/utils_lite/include",
-  "//base/security/selinux/interfaces/policycoreutils/include",
+  "//base/security/selinux_adapter/interfaces/policycoreutils/include",
 ]
 
 param_service_sources = [
@@ -132,7 +132,7 @@ if (defined(ohos_lite)) {
     if (build_selinux) {
       include_dirs += [
         "//third_party/selinux/libselinux/include/",
-        "//base/security/selinux/interfaces/policycoreutils/include/",
+        "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
       ]
       defines += [
         "PARAM_SUPPORT_SELINUX",

test/unittest/BUILD.gn

@@ -352,7 +352,7 @@ ohos_unittest("init_unittest") {
     sources += [ "param/selinux_unittest.cpp" ]
     include_dirs += [
       "//third_party/selinux/libselinux/include/",
-      "//base/security/selinux/interfaces/policycoreutils/include/",
+      "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
     ]
     sources += [
       "//base/startup/init/services/modules/selinux/selinux_adp.c",

ueventd/BUILD.gn

@@ -91,7 +91,7 @@ if (defined(ohos_lite)) {
     defines = [ "__RAMDISK__" ]
     cflags = []
     if (build_selinux) {
-      external_deps = [ "selinux:librestorecon" ]
+      external_deps = [ "selinux_adapter:librestorecon" ]
       cflags += [ "-DWITH_SELINUX" ]
     }
 
@@ -116,7 +116,7 @@ if (defined(ohos_lite)) {
     cflags = []
     deps += [ "//base/startup/init/services/param/base:param_base" ]
     if (build_selinux) {
-      external_deps = [ "selinux:librestorecon" ]
+      external_deps = [ "selinux_adapter:librestorecon" ]
       cflags += [ "-DWITH_SELINUX" ]
     }