diff --git a/bundle.json b/bundle.json index 78917641e2bbd065cc77ee075e389eef1732681e..6f8f1b4e4c39f839f9ace9ced3e5bb6c9894f79d 100755 --- a/bundle.json +++ b/bundle.json @@ -39,7 +39,7 @@ "thirdparty_bounds_checking_function", "samgr", "hiviewdfx_hilog_native", - "selinux", + "selinux_adapter", "hiviewdfx", "access_token", "common", diff --git a/services/begetctl/BUILD.gn b/services/begetctl/BUILD.gn index 8c23a07de8c46956ac6f97bdaab5a911141ded89..f891f54896d7e38df461b337dba0f5009cab0a00 100755 --- a/services/begetctl/BUILD.gn +++ b/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" ] diff --git a/services/init/standard/BUILD.gn b/services/init/standard/BUILD.gn index b22f785b71186a866d4d86db0ea41dc367bb86c9..cd22c3f773983bfcfaf44bf40bad206b4d682f6c 100644 --- a/services/init/standard/BUILD.gn +++ b/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" ] } diff --git a/services/modules/bootevent/BUILD.gn b/services/modules/bootevent/BUILD.gn index b1b12a60c7d392cef38b17d3d09e9250c3144e4c..3d76368d3fc669e3f9a1bc0a6c39ded9537c16c0 100755 --- a/services/modules/bootevent/BUILD.gn +++ b/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" ] diff --git a/services/modules/init_context/BUILD.gn b/services/modules/init_context/BUILD.gn index 2f08fd14f6ed312e4365fee8a3c75ae41cd8a7f1..3d72e1a10a93a366dddc87dd1ed77405bb192e3c 100644 --- a/services/modules/init_context/BUILD.gn +++ b/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" ] } diff --git a/services/modules/init_hook/BUILD.gn b/services/modules/init_hook/BUILD.gn index 98171616e80505f39d9227fe9bb21e0283d5d676..e550580cabc8e03cc5f1443a00bf2f01c37a73ba 100755 --- a/services/modules/init_hook/BUILD.gn +++ b/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" ] } diff --git a/services/modules/selinux/BUILD.gn b/services/modules/selinux/BUILD.gn index 11b4e0151f98780281c426ff9cc28b198c8f0467..d29d764a29433ff3d232adcc4f12604973c3354f 100755 --- a/services/modules/selinux/BUILD.gn +++ b/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" ] diff --git a/services/param/base/BUILD.gn b/services/param/base/BUILD.gn index 7641dda770eee16491006ef2bcbab72f3d3b8dd1..83b178b13555a53015da702cebfc8692cc527784 100644 --- a/services/param/base/BUILD.gn +++ b/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" ] diff --git a/services/param/linux/BUILD.gn b/services/param/linux/BUILD.gn index 00470e02cb01c6400f2f6087cb06ca6efe548d21..7f8d2a132307eeaef61080adc70f62e7d1665f21 100755 --- a/services/param/linux/BUILD.gn +++ b/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", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 99dfc80c93a65ed4f0125d7adc584630ca1bf79f..b1d78e88bfdcb43ac76d7fa73ec707d102a2c80b 100644 --- a/test/unittest/BUILD.gn +++ b/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", diff --git a/ueventd/BUILD.gn b/ueventd/BUILD.gn index 64f04616c7d0439226ed42d05746628d01598f8f..f30d27d7e883ff892b31fe157647556a0519df8f 100644 --- a/ueventd/BUILD.gn +++ b/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" ] }