From 5f6b3debed30ed39941c4935da4f675680743a43 Mon Sep 17 00:00:00 2001 From: huangxiaolinabc123 Date: Sat, 30 Jul 2022 21:17:44 +0800 Subject: [PATCH] add samgr Signed-off-by: huangxiaolinabc123 Change-Id: Ib5f3f268261fc1844c2f6591cffd3772cf0e38a2 --- bundle.json | 42 +++++++++--------- etc/BUILD.gn | 8 ++-- interfaces/innerkits/common/BUILD.gn | 12 ++--- interfaces/innerkits/lsamgr/BUILD.gn | 10 ++--- interfaces/innerkits/samgr_proxy/BUILD.gn | 22 +++++----- services/common/test/unittest/BUILD.gn | 10 ++--- services/samgr/native/BUILD.gn | 44 +++++++++---------- services/samgr/native/test/unittest/BUILD.gn | 22 +++++----- .../systemabilitymanager_fuzzer/BUILD.gn | 13 +++--- 9 files changed, 91 insertions(+), 92 deletions(-) diff --git a/bundle.json b/bundle.json index f0365df..7f143d3 100644 --- a/bundle.json +++ b/bundle.json @@ -1,24 +1,24 @@ { - "name": "@ohos/distributedschedule_samgr", + "name": "@ohos/systemabilitymgr_samgr", "description": "system ability manager", "homePage": "https://gitee.com/openharmony", "version": "3.1", "license": "Apache License 2.0", - "repository": "https://gitee.com/openharmony/distributedschedule_samgr", + "repository": "https://gitee.com/openharmony/systemabilitymgr_samgr", "publishAs": "code-segment", "segment": { - "destPath": "foundation/distributedschedule/samgr" + "destPath": "foundation/systemabilitymgr/samgr" }, "dirs": {}, "scripts": {}, "component": { - "name": "samgr_standard", - "subsystem": "distributedschedule", + "name": "samgr", + "subsystem": "systemabilitymgr", "adapted_system_type": [ "standard" ], "hisysevent_config": [ - "//foundation/distributedschedule/samgr/hisysevent.yaml" + "//foundation/systemabilitymgr/samgr/hisysevent.yaml" ], "rom": "300KB", "ram": "7130KB", @@ -31,7 +31,7 @@ "hiviewdfx_hilog_native", "init", "ipc", - "samgr_standard", + "samgr", "selinux", "startup_l2", "utils_base" @@ -42,20 +42,20 @@ "group_type": { "base_group": [], "fwk_group": [ - "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common", - "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:lsamgr", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr:lsamgr", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" ], "service_group": [ - "//foundation/distributedschedule/samgr/etc:samgr_etc", - "//foundation/distributedschedule/samgr/services/samgr/native:samgr", + "//foundation/systemabilitymgr/samgr/etc:samgr_etc", + "//foundation/systemabilitymgr/samgr/services/samgr/native:samgr", "//third_party/libxml2:libxml2" ] }, "inner_kits": [ { "header": { - "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/", + "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/", "header_files": [ "if_system_ability_manager.h", "iservice_registry.h", @@ -68,33 +68,33 @@ "sam_log.h" ] }, - "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" + "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" }, { "header": { - "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/common/include/", + "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include/", "header_files": [ "sa_profiles.h", "parse_util.h" ] }, - "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common" + "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common" }, { "header": { - "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr/", + "header_base": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr/", "header_files": [ "if_local_ability_manager.h", "local_ability_manager_proxy.h" ] }, - "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:lsamgr" + "name": "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr:lsamgr" } ], "test": [ - "//foundation/distributedschedule/samgr/services/samgr/native/test:unittest", - "//foundation/distributedschedule/samgr/test/fuzztest/systemabilitymanager_fuzzer:fuzztest", - "//foundation/distributedschedule/samgr/services/common/test:unittest" + "//foundation/systemabilitymgr/samgr/services/samgr/native/test:unittest", + "//foundation/systemabilitymgr/samgr/test/fuzztest/systemabilitymanager_fuzzer:fuzztest", + "//foundation/systemabilitymgr/samgr/services/common/test:unittest" ] } } diff --git a/etc/BUILD.gn b/etc/BUILD.gn index c41dc12..21f33bb 100644 --- a/etc/BUILD.gn +++ b/etc/BUILD.gn @@ -23,8 +23,8 @@ group("samgr_etc") { ohos_prebuilt_etc("samgr.param.dac") { source = "samgr.param.dac" relative_install_dir = "param" - part_name = "samgr_standard" - subsystem_name = "distributedschedule" + part_name = "samgr" + subsystem_name = "systemabilitymgr" } group("etc") { @@ -34,6 +34,6 @@ group("etc") { ohos_prebuilt_etc("samgr_init") { source = "samgr_standard.cfg" relative_install_dir = "init" - part_name = "samgr_standard" - subsystem_name = "distributedschedule" + part_name = "samgr" + subsystem_name = "systemabilitymgr" } diff --git a/interfaces/innerkits/common/BUILD.gn b/interfaces/innerkits/common/BUILD.gn index fe9c239..0385c09 100644 --- a/interfaces/innerkits/common/BUILD.gn +++ b/interfaces/innerkits/common/BUILD.gn @@ -16,8 +16,8 @@ import("//build/ohos.gni") config("config_samgr_common") { include_dirs = [ "include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/distributedschedule/samgr/services/dfx/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/systemabilitymgr/samgr/services/dfx/include", "//third_party/libxml2/include", ] } @@ -25,8 +25,8 @@ config("config_samgr_common") { ################################################################################ ohos_shared_library("samgr_common") { sources = [ - "//foundation/distributedschedule/samgr/services/common/src/parse_util.cpp", - "//foundation/distributedschedule/samgr/services/dfx/source/hisysevent_adapter.cpp", + "//foundation/systemabilitymgr/samgr/services/common/src/parse_util.cpp", + "//foundation/systemabilitymgr/samgr/services/dfx/source/hisysevent_adapter.cpp", ] configs = [ ":config_samgr_common" ] @@ -38,10 +38,10 @@ ohos_shared_library("samgr_common") { "hiviewdfx_hilog_native:libhilog", "utils_base:utils", ] - part_name = "samgr_standard" + part_name = "samgr" } public_deps = [ "//third_party/libxml2:libxml2" ] - subsystem_name = "distributedschedule" + subsystem_name = "systemabilitymgr" } ################################################################################ diff --git a/interfaces/innerkits/lsamgr/BUILD.gn b/interfaces/innerkits/lsamgr/BUILD.gn index 1aaaf71..111b05c 100644 --- a/interfaces/innerkits/lsamgr/BUILD.gn +++ b/interfaces/innerkits/lsamgr/BUILD.gn @@ -16,14 +16,14 @@ import("//build/ohos.gni") config("config_samgr") { visibility = [ ":*" ] include_dirs = [ - "//foundation/distributedschedule/samgr/services/lsamgr/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/systemabilitymgr/samgr/services/lsamgr/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] } config("public_config_lsamgr") { include_dirs = - [ "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr" ] + [ "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr" ] } ################################################################################ @@ -39,9 +39,9 @@ ohos_shared_library("lsamgr") { "ipc:ipc_core", "utils_base:utils", ] - part_name = "samgr_standard" + part_name = "samgr" } - subsystem_name = "distributedschedule" + subsystem_name = "systemabilitymgr" } ################################################################################ diff --git a/interfaces/innerkits/samgr_proxy/BUILD.gn b/interfaces/innerkits/samgr_proxy/BUILD.gn index 5803e86..b720a16 100644 --- a/interfaces/innerkits/samgr_proxy/BUILD.gn +++ b/interfaces/innerkits/samgr_proxy/BUILD.gn @@ -21,21 +21,21 @@ config("samgr_proxy_config") { config("samgr_proxy_private_config") { include_dirs = [ "include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr", - "//foundation/distributedschedule/samgr/services/lsamgr/include", - "//foundation/distributedschedule/samgr/services/samgr/native/include", - "//foundation/distributedschedule/samgr/utils/native/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr", + "//foundation/systemabilitymgr/samgr/services/lsamgr/include", + "//foundation/systemabilitymgr/samgr/services/samgr/native/include", + "//foundation/systemabilitymgr/samgr/utils/native/include", ] } ohos_shared_library("samgr_proxy") { defines = [ "SAMGR_PROXY" ] sources = [ - "//foundation/distributedschedule/samgr/frameworks/native/source/system_ability_load_callback_stub.cpp", - "//foundation/distributedschedule/samgr/frameworks/native/source/system_ability_manager_proxy.cpp", - "//foundation/distributedschedule/samgr/frameworks/native/source/system_ability_status_change_stub.cpp", - "//foundation/distributedschedule/samgr/services/lsamgr/src/local_ability_manager_proxy.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/service_registry.cpp", + "//foundation/systemabilitymgr/samgr/frameworks/native/source/system_ability_load_callback_stub.cpp", + "//foundation/systemabilitymgr/samgr/frameworks/native/source/system_ability_manager_proxy.cpp", + "//foundation/systemabilitymgr/samgr/frameworks/native/source/system_ability_status_change_stub.cpp", + "//foundation/systemabilitymgr/samgr/services/lsamgr/src/local_ability_manager_proxy.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/service_registry.cpp", ] configs = [ ":samgr_proxy_private_config" ] public_configs = [ ":samgr_proxy_config" ] @@ -47,10 +47,10 @@ ohos_shared_library("samgr_proxy") { "utils_base:utils", ] - part_name = "samgr_standard" + part_name = "samgr" } install_images = [ system_base_dir ] relative_install_dir = "chipset-pub-sdk" - subsystem_name = "distributedschedule" + subsystem_name = "systemabilitymgr" } diff --git a/services/common/test/unittest/BUILD.gn b/services/common/test/unittest/BUILD.gn index 60dc990..f22bd80 100644 --- a/services/common/test/unittest/BUILD.gn +++ b/services/common/test/unittest/BUILD.gn @@ -13,22 +13,22 @@ import("//build/test.gni") -module_output_path = "samgr_standard/samgr" +module_output_path = "samgr/samgr" ohos_unittest("ParseUtilTest") { module_out_path = module_output_path resource_config_file = - "//foundation/distributedschedule/samgr/test/resource/ohos_test.xml" + "//foundation/systemabilitymgr/samgr/test/resource/ohos_test.xml" include_dirs = [ - "//foundation/distributedschedule/samgr/interfaces/innerkits/common/include", - "//foundation/distributedschedule/samgr/utils/native/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include", + "//foundation/systemabilitymgr/samgr/utils/native/include", ] sources = [ "./parse_util_test.cpp" ] deps = [ - "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common", "//third_party/googletest:gtest_main", ] diff --git a/services/samgr/native/BUILD.gn b/services/samgr/native/BUILD.gn index 4006f0e..2e8f2b5 100644 --- a/services/samgr/native/BUILD.gn +++ b/services/samgr/native/BUILD.gn @@ -17,44 +17,44 @@ import("//build/ohos_var.gni") config("distributed_store_config") { visibility = [ ":*" ] include_dirs = - [ "//foundation/distributedschedule/samgr/services/samgr/native/include" ] + [ "//foundation/systemabilitymgr/samgr/services/samgr/native/include" ] } config("sam_config") { # header file path include_dirs = [ - "//foundation/distributedschedule/samgr/services/samgr/native/include", - "//foundation/distributedschedule/samgr/services/dfx/include", - "//foundation/distributedschedule/samgr/utils/native/include", - "//foundation/distributedschedule/samgr/services/lsamgr/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/common/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/systemabilitymgr/samgr/services/samgr/native/include", + "//foundation/systemabilitymgr/samgr/services/dfx/include", + "//foundation/systemabilitymgr/samgr/utils/native/include", + "//foundation/systemabilitymgr/samgr/services/lsamgr/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] } ohos_executable("samgr") { install_enable = true sources = [ - "//foundation/distributedschedule/samgr/services/dfx/source/hisysevent_adapter.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/ability_death_recipient.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/main.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/rpc_callback_imp.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/system_ability_load_callback_proxy.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/system_ability_manager.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/system_ability_manager_stub.cpp", - "//foundation/distributedschedule/samgr/services/samgr/native/source/system_ability_status_change_proxy.cpp", - "//foundation/distributedschedule/samgr/utils/native/source/tools.cpp", + "//foundation/systemabilitymgr/samgr/services/dfx/source/hisysevent_adapter.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/ability_death_recipient.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/main.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/rpc_callback_imp.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/system_ability_load_callback_proxy.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/system_ability_manager.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/system_ability_manager_stub.cpp", + "//foundation/systemabilitymgr/samgr/services/samgr/native/source/system_ability_status_change_proxy.cpp", + "//foundation/systemabilitymgr/samgr/utils/native/source/tools.cpp", ] deps = [ - "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common", - "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:lsamgr", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:samgr_common", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr:lsamgr", ] configs = [ ":sam_config", - "//foundation/distributedschedule/samgr/interfaces/innerkits/common:config_samgr_common", - "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:config_samgr", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/common:config_samgr_common", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/lsamgr:config_samgr", ":distributed_store_config", ] @@ -76,7 +76,7 @@ ohos_executable("samgr") { defines = [ "WITH_SELINUX" ] } public_deps = [ "//third_party/libxml2:libxml2" ] - part_name = "samgr_standard" + part_name = "samgr" } - subsystem_name = "distributedschedule" + subsystem_name = "systemabilitymgr" } diff --git a/services/samgr/native/test/unittest/BUILD.gn b/services/samgr/native/test/unittest/BUILD.gn index e107023..f8b915e 100644 --- a/services/samgr/native/test/unittest/BUILD.gn +++ b/services/samgr/native/test/unittest/BUILD.gn @@ -13,16 +13,16 @@ import("//build/test.gni") -module_output_path = "samgr_standard/samgr" -samgr_dir = "//foundation/distributedschedule/samgr" +module_output_path = "samgr/samgr" +samgr_dir = "//foundation/systemabilitymgr/samgr" samgr_services_dir = "${samgr_dir}/services/samgr/native" config("sam_test_config") { visibility = [ ":*" ] include_dirs = [ "${samgr_services_dir}/test/unittest/include", - "//foundation/distributedschedule/samgr/services/dfx/include", - "//foundation/distributedschedule/samgr/utils/native/include", + "//foundation/systemabilitymgr/samgr/services/dfx/include", + "//foundation/systemabilitymgr/samgr/utils/native/include", ] } @@ -39,7 +39,7 @@ ohos_unittest("SystemAbilityMgrTest") { "${samgr_services_dir}/test/unittest/src/itest_transaction_service.cpp", "${samgr_services_dir}/test/unittest/src/sa_status_change_mock.cpp", "${samgr_services_dir}/test/unittest/src/system_ability_mgr_test.cpp", - "//foundation/distributedschedule/samgr/services/dfx/source/hisysevent_adapter.cpp", + "//foundation/systemabilitymgr/samgr/services/dfx/source/hisysevent_adapter.cpp", ] configs = [ @@ -92,11 +92,11 @@ ohos_executable("ondemand") { } external_deps += [ "ipc:ipc_core", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "utils_base:utils", ] - part_name = "samgr_standard" - subsystem_name = "distributedschedule" + part_name = "samgr" + subsystem_name = "systemabilitymgr" } ohos_executable("TestTool") { @@ -111,7 +111,7 @@ ohos_executable("TestTool") { "${samgr_services_dir}/source/system_ability_status_change_proxy.cpp", "${samgr_services_dir}/test/unittest/src/itest_transaction_service.cpp", "./src/system_ability_test_tool.cpp", - "//foundation/distributedschedule/samgr/services/dfx/source/hisysevent_adapter.cpp", + "//foundation/systemabilitymgr/samgr/services/dfx/source/hisysevent_adapter.cpp", ] configs = [ @@ -146,8 +146,8 @@ ohos_executable("TestTool") { "ipc:libdbinder", "utils_base:utils", ] - part_name = "samgr_standard" - subsystem_name = "distributedschedule" + part_name = "samgr" + subsystem_name = "systemabilitymgr" } group("unittest") { diff --git a/test/fuzztest/systemabilitymanager_fuzzer/BUILD.gn b/test/fuzztest/systemabilitymanager_fuzzer/BUILD.gn index 8a5d71b..729fc70 100644 --- a/test/fuzztest/systemabilitymanager_fuzzer/BUILD.gn +++ b/test/fuzztest/systemabilitymanager_fuzzer/BUILD.gn @@ -15,20 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "samgr_standard/samgr" -samgr_dir = "//foundation/distributedschedule/samgr" +module_output_path = "samgr/samgr" +samgr_dir = "//foundation/systemabilitymgr/samgr" samgr_services_dir = "${samgr_dir}/services/samgr/native" config("sam_fuzz_test_config") { - include_dirs = - [ "//foundation/distributedschedule/samgr/services/dfx/include" ] + include_dirs = [ "//foundation/systemabilitymgr/samgr/services/dfx/include" ] } ##############################fuzztest########################################## ohos_fuzztest("SystemAbilityManagerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/distributedschedule/samgr/test/fuzztest/systemabilitymanager_fuzzer" + fuzz_config_file = "//foundation/systemabilitymgr/samgr/test/fuzztest/systemabilitymanager_fuzzer" configs = [ ":sam_fuzz_test_config", @@ -46,7 +45,7 @@ ohos_fuzztest("SystemAbilityManagerFuzzTest") { "${samgr_dir}/utils/native/source/tools.cpp", "${samgr_services_dir}/source/system_ability_manager.cpp", "${samgr_services_dir}/source/system_ability_manager_stub.cpp", - "//foundation/distributedschedule/samgr/services/dfx/source/hisysevent_adapter.cpp", + "//foundation/systemabilitymgr/samgr/services/dfx/source/hisysevent_adapter.cpp", "systemabilitymanager_fuzzer.cpp", ] deps = [] @@ -60,7 +59,7 @@ ohos_fuzztest("SystemAbilityManagerFuzzTest") { "init:libbegetutil", "ipc:ipc_core", "ipc:libdbinder", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "utils_base:utils", ] public_deps = [ "//third_party/libxml2:libxml2" ]