From 93b1b18f77eb5df11603df02db01fa795bbf5135 Mon Sep 17 00:00:00 2001 From: chen Date: Mon, 25 Jul 2022 20:20:30 +0800 Subject: [PATCH] add samgr Signed-off-by: chen Change-Id: I4db8ab380de939e22e9e350ad5be1a83130c5232 --- ability_lite/ability_posix/BUILD.gn | 6 +++--- ai_lite/ai_engine_posix/base/BUILD.gn | 10 +++++----- appexecfwk_lite/appexecfwk_posix/BUILD.gn | 6 +++--- applications/kitframework/BUILD.gn | 4 ++-- build_lite/BUILD.gn | 2 +- .../distributed_schedule_posix/BUILD.gn | 12 ++++++------ .../system_ability_manager_hal/BUILD.gn | 13 ++++++------- .../system_ability_manager_posix/BUILD.gn | 10 +++++----- distributedschedule/BUILD.gn | 2 +- security_lite/deviceauth_basic_deps/BUILD.gn | 2 +- security_lite/permission_posix/pms/BUILD.gn | 8 ++++---- startup_lite/bootstrap_posix/BUILD.gn | 4 ++-- test_packages.gni | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/ability_lite/ability_posix/BUILD.gn b/ability_lite/ability_posix/BUILD.gn index 9624fd8b1..1aafd1cc7 100755 --- a/ability_lite/ability_posix/BUILD.gn +++ b/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/appdatamgr/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", diff --git a/ai_lite/ai_engine_posix/base/BUILD.gn b/ai_lite/ai_engine_posix/base/BUILD.gn index 2f0abdf65..be3e0c8c6 100644 --- a/ai_lite/ai_engine_posix/base/BUILD.gn +++ b/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", ] diff --git a/appexecfwk_lite/appexecfwk_posix/BUILD.gn b/appexecfwk_lite/appexecfwk_posix/BUILD.gn index afaa8b266..dc03af3c0 100755 --- a/appexecfwk_lite/appexecfwk_posix/BUILD.gn +++ b/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" ] diff --git a/applications/kitframework/BUILD.gn b/applications/kitframework/BUILD.gn index 3ba527417..cc46e27c8 100644 --- a/applications/kitframework/BUILD.gn +++ b/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/", diff --git a/build_lite/BUILD.gn b/build_lite/BUILD.gn index c248108a9..92a2fa64a 100644 --- a/build_lite/BUILD.gn +++ b/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", diff --git a/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn b/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn index f02fef17a..fd34a2ca1 100755 --- a/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn +++ b/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/distributedschedule/dmsfwk_lite/include", - "//foundation/distributedschedule/samgr_lite/interfaces/innerkits", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/dmsfwk_lite/include", + "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite", @@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/dmsfwk_lite:dtbschedmgr", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] cflags = [ "-Wno-error" ] diff --git a/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn b/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn index c1d357b46..8c0e2a78c 100755 --- a/distributed_schedule_lite/system_ability_manager_hal/BUILD.gn +++ b/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" ] diff --git a/distributed_schedule_lite/system_ability_manager_posix/BUILD.gn b/distributed_schedule_lite/system_ability_manager_posix/BUILD.gn index 44f85cb43..dd19e3281 100755 --- a/distributed_schedule_lite/system_ability_manager_posix/BUILD.gn +++ b/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" ] diff --git a/distributedschedule/BUILD.gn b/distributedschedule/BUILD.gn index c2478d430..414d8ff9a 100644 --- a/distributedschedule/BUILD.gn +++ b/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" ] diff --git a/security_lite/deviceauth_basic_deps/BUILD.gn b/security_lite/deviceauth_basic_deps/BUILD.gn index 515d44a1e..2f8a27cbb 100644 --- a/security_lite/deviceauth_basic_deps/BUILD.gn +++ b/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 diff --git a/security_lite/permission_posix/pms/BUILD.gn b/security_lite/permission_posix/pms/BUILD.gn index 605fc59c3..bbdc28652 100644 --- a/security_lite/permission_posix/pms/BUILD.gn +++ b/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", ] diff --git a/startup_lite/bootstrap_posix/BUILD.gn b/startup_lite/bootstrap_posix/BUILD.gn index 0c4f7ed34..612c22bf7 100755 --- a/startup_lite/bootstrap_posix/BUILD.gn +++ b/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" ] diff --git a/test_packages.gni b/test_packages.gni index e42c98ee9..07b4f58a3 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -42,7 +42,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 = [ -- GitLab