openharmony/distributedschedule_safwk
1
0
Fork 0
mirror of https://github.com/openharmony/distributedschedule_safwk.git synced 2026-07-01 06:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

add samgr

Browse Source 
Signed-off-by: chen <chenkang40@huawei.com>
Change-Id: I2f6a155cce72f8d1c09f9683171a29b3765a74c5
This commit is contained in:
chen
2022-07-21 20:56:40 +08:00
parent 61e1b5f98d
commit e876f97e46
9 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle.json
+12 -12
View File
@@ -1,19 +1,19 @@
{
"name": "@ohos/distributedschedule_safwk",
"name": "@ohos/systemabilitymgr_safwk",
"description": "system ability framework",
"homePage": "https://gitee.com/openharmony",
"version": "3.1",
"license": "Apache License 2.0",
"repository": "https://gitee.com/openharmony/distributedschedule_safwk",
"repository": "https://gitee.com/openharmony/systemabilitymgr_safwk",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/distributedschedule/safwk"
"destPath": "foundation/systemabilitymgr/safwk"
},
"dirs": {},
"scripts": {},
"component": {
"name": "safwk",
"subsystem": "distributedschedule",
"subsystem": "systemabilitymgr",
"adapted_system_type": [
"standard"
],
@@ -24,7 +24,7 @@
"hitrace_native",
"hiviewdfx_hilog_native",
"ipc",
"samgr_standard",
"samgr",
"utils_base"
],
"third_party": [ "libxml2" ]
@@ -32,10 +32,10 @@
"build": {
"group_type": {
"base_group": [
"//foundation/distributedschedule/safwk/etc/profile:foundation_cfg",
"//foundation/distributedschedule/safwk/etc/profile:foundation_trust",
"//foundation/distributedschedule/safwk/services/safwk:sa_main",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk"
"//foundation/systemabilitymgr/safwk/etc/profile:foundation_cfg",
"//foundation/systemabilitymgr/safwk/etc/profile:foundation_trust",
"//foundation/systemabilitymgr/safwk/services/safwk:sa_main",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk"
],
"fwk_group": [],
"service_group": []
@@ -43,16 +43,16 @@
"inner_kits": [
{
"header": {
"header_base": "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
"header_base": "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"header_files": [
"system_ability.h"
]
},
"name": "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk"
"name": "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk"
}
],
"test": [
"//foundation/distributedschedule/safwk/test:unittest"
"//foundation/systemabilitymgr/safwk/test:unittest"
]
}
}
etc/profile/BUILD.gn
+2 -2
View File
@@ -17,12 +17,12 @@ ohos_prebuilt_etc("foundation_trust") {
source = "foundation_trust.xml"
module_install_dir = "profile"
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}
ohos_prebuilt_etc("foundation_cfg") {
source = "foundation.cfg"
relative_install_dir = "init"
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}
interfaces/innerkits/safwk/BUILD.gn
+5 -5
View File
@@ -20,7 +20,7 @@ config("system_ability_config") {
visibility = [ ":*" ]
include_dirs = [
"../../../services/safwk/include",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
]
}
@@ -38,15 +38,15 @@ ohos_shared_library("system_ability_fwk") {
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:lsamgr",
"samgr_standard:samgr_common",
"samgr_standard:samgr_proxy",
"samgr:lsamgr",
"samgr:samgr_common",
"samgr:samgr_proxy",
"utils_base:utils",
]
public_deps = [ "//third_party/libxml2:libxml2" ]
}
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}
################################################################################
services/safwk/BUILD.gn
+6 -6
View File
@@ -17,8 +17,8 @@ import("//build/ohos.gni")
config("config_safwk") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/distributedschedule/safwk/services/safwk/include",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
"//foundation/systemabilitymgr/safwk/services/safwk/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
]
}
@@ -37,14 +37,14 @@ ohos_executable("sa_main") {
"hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:lsamgr",
"samgr_standard:samgr_common",
"samgr_standard:samgr_proxy",
"samgr:lsamgr",
"samgr:samgr_common",
"samgr:samgr_proxy",
"utils_base:utils",
]
}
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}
################################################################################
test/mock/common/audio_ability/BUILD.gn
+3 -3
View File
@@ -17,7 +17,7 @@ config("test_audio_ability_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//foundation/distributedschedule/safwk/services/safwk/include",
"//foundation/systemabilitymgr/safwk/services/safwk/include",
"//utils/system/safwk/native/include",
]
}
@@ -30,7 +30,7 @@ ohos_shared_library("test_audio_ability") {
]
configs = [ ":test_audio_ability_config" ]
deps = [ "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk" ]
deps = [ "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk" ]
external_deps = [
"hiviewdfx_hilog_native:libhilog",
@@ -39,5 +39,5 @@ ohos_shared_library("test_audio_ability") {
]
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}
test/mock/common/ondemand_ability/BUILD.gn
+3 -3
View File
@@ -17,7 +17,7 @@ config("ondemand_ability_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//foundation/distributedschedule/safwk/services/safwk/include",
"//foundation/systemabilitymgr/safwk/services/safwk/include",
"//utils/system/safwk/native/include",
]
}
@@ -31,7 +31,7 @@ ohos_shared_library("test_ondemand_ability") {
configs = [ ":ondemand_ability_config" ]
deps = [
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//utils/native/base:utils",
]
@@ -41,5 +41,5 @@ ohos_shared_library("test_ondemand_ability") {
"utils_base:utils",
]
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}
test/resource/ohos_test.xml
+2 -2
View File
@@ -19,8 +19,8 @@
<option name="push" value="profile/test_trust_not_all_allow.xml -> /data/test/resource/safwk/profile/" src="res"/>
<option name="push" value="profile/test_trust_all_allow.xml -> /data/test/resource/safwk/profile/" src="res"/>
<option name="push" value="profile/profile_audio.xml -> /system/usr/" src="res"/>
<option name="push" value="distributedschedule/safwk/libtest_audio_ability.z.so -> /data/test/" src="out"/>
<option name="push" value="distributedschedule/safwk/libtest_ondemand_ability.z.so -> /data/test/" src="out"/>
<option name="push" value="systemabilitymgr/safwk/libtest_audio_ability.z.so -> /data/test/" src="out"/>
<option name="push" value="systemabilitymgr/safwk/libtest_ondemand_ability.z.so -> /data/test/" src="out"/>
</preparer>
</target>
</configuration>
test/services/safwk/unittest/BUILD.gn
+8 -8
View File
@@ -18,18 +18,18 @@ module_output_path = "safwk/safwk"
ohos_unittest("LocalAbilityManagerTest") {
module_out_path = module_output_path
resource_config_file =
"//foundation/distributedschedule/safwk/test/resource/ohos_test.xml"
"//foundation/systemabilitymgr/safwk/test/resource/ohos_test.xml"
include_dirs =
[ "//foundation/distributedschedule/safwk/services/safwk/include" ]
[ "//foundation/systemabilitymgr/safwk/services/safwk/include" ]
sources = [ "./local_ability_manager_test.cpp" ]
deps = [
"listen_ability:listen_test",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/safwk/test/mock/common/audio_ability:test_audio_ability",
"//foundation/distributedschedule/safwk/test/mock/common/ondemand_ability:test_ondemand_ability",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/systemabilitymgr/safwk/test/mock/common/audio_ability:test_audio_ability",
"//foundation/systemabilitymgr/safwk/test/mock/common/ondemand_ability:test_ondemand_ability",
"//third_party/googletest:gtest_main",
]
@@ -41,9 +41,9 @@ ohos_unittest("LocalAbilityManagerTest") {
external_deps = [
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:lsamgr",
"samgr_standard:samgr_common",
"samgr_standard:samgr_proxy",
"samgr:lsamgr",
"samgr:samgr_common",
"samgr:samgr_proxy",
"utils_base:utils",
]
}
test/services/safwk/unittest/listen_ability/BUILD.gn
+3 -3
View File
@@ -28,7 +28,7 @@ ohos_shared_library("listen_test") {
configs = [ ":listen_ability_config" ]
deps = [
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//utils/native/base:utils",
]
@@ -40,9 +40,9 @@ ohos_shared_library("listen_test") {
external_deps += [
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"samgr:samgr_proxy",
"utils_base:utils",
]
part_name = "safwk"
subsystem_name = "distributedschedule"
subsystem_name = "systemabilitymgr"
}