diff --git a/OAT.xml b/OAT.xml
index 9b3e485a8146afce44cbf1f00cbd491a6674f7db..2f102fb2a1fad4dc527d1c52a243e19262092cda 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -56,7 +56,7 @@ Note:If the text contains special characters, please escape them according to th
-
+
diff --git a/interfaces/innerkits/lsamgr/BUILD.gn b/interfaces/innerkits/lsamgr/BUILD.gn
index 06dae698402102f8b5299b549a225649205b1fcd..932b647b5e92c6b84d318ff39c96a4cfd58838a3 100755
--- a/interfaces/innerkits/lsamgr/BUILD.gn
+++ b/interfaces/innerkits/lsamgr/BUILD.gn
@@ -33,7 +33,7 @@ ohos_shared_library("lsamgr") {
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
]
- part_name = "samgr_L2"
+ part_name = "samgr_standard"
}
deps = [ "//utils/native/base:utils" ]
diff --git a/interfaces/innerkits/samgr_proxy/BUILD.gn b/interfaces/innerkits/samgr_proxy/BUILD.gn
index cefe2c2eb102f87c1bac152cf55e34abd055d659..2c92a7ecfe3deea1d1090fd8295550ff3487eed8 100755
--- a/interfaces/innerkits/samgr_proxy/BUILD.gn
+++ b/interfaces/innerkits/samgr_proxy/BUILD.gn
@@ -54,7 +54,7 @@ ohos_shared_library("samgr_proxy") {
]
deps = [ "//utils/native/base:utils" ]
- part_name = "samgr_L2"
+ part_name = "samgr_standard"
}
subsystem_name = "distributedschedule"
}
diff --git a/ohos.build b/ohos.build
index 62c277ea1f4aa63ddc639ca3ef232232765f33a5..b69fdd50a7c4ba4375622151384e4d0fc22a5b85 100755
--- a/ohos.build
+++ b/ohos.build
@@ -26,6 +26,33 @@
],
"test_list": ["//foundation/distributedschedule/samgr/services/samgr/native/test:unittest"],
"system_kits": []
+ },
+ "samgr_standard": {
+ "variants": ["phone", "wearable"],
+ "inner_kits": [
+ {
+ "header": {
+ "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/",
+ "header_files": [
+ "iservice_registry.h",
+ "if_system_ability_manager.h",
+ "system_ability_manager_proxy.h",
+ "sam_log.h",
+ "system_ability_info.h",
+ "if_system_ability_connection_callback.h"
+ ]
+ },
+ "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy"
+ }
+ ],
+ "module_list": [
+ "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+ "//foundation/distributedschedule/samgr/services/samgr/native:samgr",
+ "//foundation/distributedschedule/samgr/services/samgr/native:etc",
+ "//third_party/libxml2:libxml2"
+ ],
+ "test_list": ["//foundation/distributedschedule/samgr/services/samgr/native/test:unittest"],
+ "system_kits": []
}
},
"subsystem": "distributedschedule"
diff --git a/services/samgr/native/BUILD.gn b/services/samgr/native/BUILD.gn
index 9b7e4a4e6301e3f1c5303106c1fb34ba7b8c4428..e3c8d1bb4e24db203601dd93e0096488d0d25064 100755
--- a/services/samgr/native/BUILD.gn
+++ b/services/samgr/native/BUILD.gn
@@ -43,11 +43,11 @@ group("etc") {
ohos_prebuilt_etc("samgr.rc") {
relative_install_dir = "init"
if (use_musl) {
- source = "samgr_L2.cfg"
+ source = "samgr_standard.cfg"
} else {
- source = "samgr_L2.rc"
+ source = "samgr_standard.rc"
}
- part_name = "samgr_L2"
+ part_name = "samgr_standard"
subsystem_name = "distributedschedule"
}
@@ -67,7 +67,7 @@ ohos_executable("samgr") {
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//utils/native/base:utils",
]
-
+
configs = [
":sam_config",
"//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:config_samgr",
@@ -81,7 +81,7 @@ ohos_executable("samgr") {
"ipc:libdbinder",
]
public_deps = [ "//third_party/libxml2:libxml2" ]
- part_name = "samgr_L2"
+ part_name = "samgr_standard"
}
subsystem_name = "distributedschedule"
}
diff --git a/services/samgr/native/samgr_L2.cfg b/services/samgr/native/samgr_standard.cfg
old mode 100644
new mode 100755
similarity index 100%
rename from services/samgr/native/samgr_L2.cfg
rename to services/samgr/native/samgr_standard.cfg
diff --git a/services/samgr/native/samgr_L2.rc b/services/samgr/native/samgr_standard.rc
similarity index 100%
rename from services/samgr/native/samgr_L2.rc
rename to services/samgr/native/samgr_standard.rc