samgr part name rectify

Signed-off-by: zmx <1029211721@qq.com>
Change-Id: I24ac9c62a8c586fb7c23a7623404af7abc92d2df
This commit is contained in:
zmx
2021-10-15 14:26:43 +08:00
parent 8eb4e45531
commit 613e066e1f
7 changed files with 35 additions and 8 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ Note:If the text contains special characters, please escape them according to th
<licensefile></licensefile>
<filefilterlist>
<filefilter name="copyrightPolicyFilter" desc="copyright文件头校验策略的过滤条件" >
<filteritem type="filepath" name="services/samgr/native/samgr_L2.cfg" desc="cfg文件为json格式,无法添加版权头"/>
<filteritem type="filepath" name="services/samgr/native/samgr_standard.cfg" desc="cfg文件为json格式,无法添加版权头"/>
</filefilter>
</filefilterlist>
</oatconfig>
+1 -1
View File
@@ -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" ]
+1 -1
View File
@@ -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"
}
+27
View File
@@ -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"
+5 -5
View File
@@ -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"
}