!4588 samgr部件化整改

Merge pull request !4588 from chen/725

ability_lite/ability_posix/BUILD.gn

@@ -28,7 +28,7 @@ hcpptest_suite("ActsAbilityMgrTest") {
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
     "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
   ]
   if (enable_ohos_appexecfwk_feature_ability == true) {
     deps += [
@@ -49,8 +49,8 @@ hcpptest_suite("ActsAbilityMgrTest") {
     "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/",
     "${appexecfwk_lite_path}/utils/bundle_lite",
     "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//third_party/bounds_checking_function/include",
     "//third_party/cJSON",
     "//utils/native/lite/include",

ai_lite/ai_engine_posix/base/BUILD.gn

@@ -47,17 +47,17 @@ hcpptest_suite("ActsAiEngineTest") {
     "//utils/native/lite/include",
     "//kernel/liteos-a/kernel/include",
     "//kernel/liteos-a/kernel/common",
-    "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
-    "//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
   ]
   deps = [
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//foundation/ai/engine/services/client:client",
     "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation",
     "//foundation/ai/engine/services/server/plugin_manager:plugin_manager",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
     "//test/xts/acts/ai_lite/ai_engine_posix/base/src/sample:sample_plugin_1_sync",
     "//test/xts/acts/ai_lite/ai_engine_posix/base/src/sample:sample_plugin_2_async",
   ]

appexecfwk_lite/appexecfwk_posix/BUILD.gn

@@ -26,8 +26,8 @@ hcpptest_suite("ActsBundleMgrTest") {
     "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/",
     "${appexecfwk_lite_path}/utils/bundle_lite",
     "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
     "//third_party/googletest/googletest/include",
     "//utils/native/lite/include",
     "${aafwk_lite_path}/interfaces/innerkits/intent_lite",
@@ -37,7 +37,7 @@ hcpptest_suite("ActsBundleMgrTest") {
     "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
   ]
 
   cflags = [ "-Wno-error" ]

applications/kitframework/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/lite/build/suite_lite.gni")
 
@@ -22,7 +22,7 @@ hctest_suite("ActsKitFwkApiTest") {
     "//test/xts/tools/lite/hctest/include",
     "//third_party/unity/src",
     "//utils/native/lite/include",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//third_party/bounds_checking_function/include/",
     "//third_party/mbedtls/include/",
     "//third_party/cJSON/",

build_lite/BUILD.gn

@@ -64,7 +64,7 @@ lite_component("acts_component") {
 
         "//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest",
 
-        #"//test/xts/acts/distributedschedule_lite/distributed_schedule_posix:ActsDMSTest",
+        #"//test/xts/acts/systemabilitymgr_lite/distributed_schedule_posix:ActsDMSTest",
         "//test/xts/acts/hiviewdfx_lite/hilog_posix:ActsHilogTest",
 
         "//test/xts/acts/appexecfwk_lite/appexecfwk_posix:ActsBundleMgrTest",

distributed_schedule_lite/distributed_schedule_posix/BUILD.gn

@@ -28,10 +28,10 @@ hcpptest_suite("ActsDMSTest") {
     "//utils/native/lite/include",
     "//third_party/bounds_checking_function/include",
     "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//foundation/ability/dmsfwk_lite/include",
-    "//foundation/distributedschedule/samgr_lite/interfaces/innerkits",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits",
 
     "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite",
     "${aafwk_lite_path}/interfaces/kits/ability_lite",
@@ -45,7 +45,7 @@ hcpptest_suite("ActsDMSTest") {
     "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//foundation/ability/dmsfwk_lite:dtbschedmgr",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
   cflags = [ "-Wno-error" ]

distributed_schedule_lite/system_ability_manager_hal/BUILD.gn

@@ -38,17 +38,16 @@ hctest_suite("ActsSamgrTest") {
     "//test/xts/tools/hctest/include",
     "//third_party/unity/src",
     "//kernel/liteos_m/kal",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast",
-    "//foundation/distributedschedule/samgr_lite/samgr/adapter",
-    "//foundation/distributedschedule/samgr_lite/samgr/source",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
+    "//foundation/systemabilitymgr/samgr_lite/samgr/adapter",
+    "//foundation/systemabilitymgr/samgr_lite/samgr/source",
     "src",
     "utils",
   ]
 
-  public_deps = [
-    "//foundation/distributedschedule/samgr_lite/samgr/adapter:samgr_adapter",
-  ]
+  public_deps =
+      [ "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter" ]
   defines = [ "UNITY_INCLUDE_CONFIG_H" ]
 
   cflags = [ "-Wno-error" ]

distributed_schedule_lite/system_ability_manager_posix/BUILD.gn

@@ -69,15 +69,15 @@ hcpptest_suite("ActsSamgrTest") {
     "include",
     "//utils/native/native_lite/include",
     "//third_party/bounds_checking_function/include",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
   ]
   deps = [
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
-    "//foundation/distributedschedule/samgr_lite/communication/broadcast:broadcast",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/communication/broadcast:broadcast",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
   cflags = [ "-Wno-error" ]

distributedschedule/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//build/ohos_var.gni")
 
-group("distributedschedule") {
+group("systemabilitymgr") {
   testonly = true
   if (is_standard_system) {
     deps = [ "dmsfwk:dmsfwk" ]

security_lite/deviceauth_basic_deps/BUILD.gn

@@ -26,7 +26,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
     "//utils/native/lite/include",
     "//test/xts/tools/lite/hctest/include",
     "//third_party/unity/src",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
   ]
 
   include_dirs += DEVICEAUTH_BASIC_DEPS_INC

security_lite/permission_posix/pms/BUILD.gn

@@ -32,8 +32,8 @@ hcpptest_suite("ActsPMSTest") {
     "src",
     "include",
     "//utils/native/lite/include",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
     "//base/security/permission_lite/interfaces/innerkits",
     "//base/security/permission_lite/interfaces/kits",
     "//base/security/permission_lite/services/pms_base/include",
@@ -46,8 +46,8 @@ hcpptest_suite("ActsPMSTest") {
     "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
     "//base/security/permission_lite/services:permission_lite",
     "//build/lite/config/component/cJSON:cjson_shared",
-    "//foundation/distributedschedule/samgr_lite/communication/broadcast",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/communication/broadcast",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
 

startup_lite/bootstrap_posix/BUILD.gn

@@ -24,11 +24,11 @@ hcpptest_suite("ActsBootstrapTest") {
     "src",
     "//utils/native/native_lite/include",
     "//third_party/bounds_checking_function/include/",
-    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
   ]
 
   deps = [
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
+    "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
   cflags = [ "-Wno-error" ]

test_packages.gni

@@ -46,7 +46,7 @@ _all_test_packages = [
   "${ACTS_ROOT}/settingsdata:settingsdata",
   "${ACTS_ROOT}/barrierfree:barrierfree",
   "${ACTS_ROOT}/customization:customization",
-  "${ACTS_ROOT}/distributedschedule:distributedschedule",
+  "${ACTS_ROOT}/distributedschedule:systemabilitymgr",
 ]
 
 _all_test_packages_ivi = [