提交 93b1b18f 编写于 作者: C chen

add samgr

Signed-off-by: Nchen <chenkang40@huawei.com>
Change-Id: I4db8ab380de939e22e9e350ad5be1a83130c5232
上级 3747d7c6
...@@ -28,7 +28,7 @@ hcpptest_suite("ActsAbilityMgrTest") { ...@@ -28,7 +28,7 @@ hcpptest_suite("ActsAbilityMgrTest") {
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/distributeddatamgr/appdatamgr/kv_store/interfaces/inner_api/kv_store:kv_store", "//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) { if (enable_ohos_appexecfwk_feature_ability == true) {
deps += [ deps += [
...@@ -49,8 +49,8 @@ hcpptest_suite("ActsAbilityMgrTest") { ...@@ -49,8 +49,8 @@ hcpptest_suite("ActsAbilityMgrTest") {
"${appexecfwk_lite_path}/interfaces/kits/bundle_lite/", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/",
"${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite",
"${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/", "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/cJSON", "//third_party/cJSON",
"//utils/native/lite/include", "//utils/native/lite/include",
......
...@@ -47,17 +47,17 @@ hcpptest_suite("ActsAiEngineTest") { ...@@ -47,17 +47,17 @@ hcpptest_suite("ActsAiEngineTest") {
"//utils/native/lite/include", "//utils/native/lite/include",
"//kernel/liteos-a/kernel/include", "//kernel/liteos-a/kernel/include",
"//kernel/liteos-a/kernel/common", "//kernel/liteos-a/kernel/common",
"//foundation/distributedschedule/samgr_lite/interfaces/innerkits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
"//foundation/distributedschedule/samgr_lite/interfaces/innerkits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/samgr",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
] ]
deps = [ deps = [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/ai/engine/services/client:client", "//foundation/ai/engine/services/client:client",
"//foundation/ai/engine/services/common/platform/dl_operation:dlOperation", "//foundation/ai/engine/services/common/platform/dl_operation:dlOperation",
"//foundation/ai/engine/services/server/plugin_manager:plugin_manager", "//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_1_sync",
"//test/xts/acts/ai_lite/ai_engine_posix/base/src/sample:sample_plugin_2_async", "//test/xts/acts/ai_lite/ai_engine_posix/base/src/sample:sample_plugin_2_async",
] ]
......
...@@ -26,8 +26,8 @@ hcpptest_suite("ActsBundleMgrTest") { ...@@ -26,8 +26,8 @@ hcpptest_suite("ActsBundleMgrTest") {
"${appexecfwk_lite_path}/interfaces/kits/bundle_lite/", "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/",
"${appexecfwk_lite_path}/utils/bundle_lite", "${appexecfwk_lite_path}/utils/bundle_lite",
"${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/", "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite/",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
"//third_party/googletest/googletest/include", "//third_party/googletest/googletest/include",
"//utils/native/lite/include", "//utils/native/lite/include",
"${aafwk_lite_path}/interfaces/innerkits/intent_lite", "${aafwk_lite_path}/interfaces/innerkits/intent_lite",
...@@ -37,7 +37,7 @@ hcpptest_suite("ActsBundleMgrTest") { ...@@ -37,7 +37,7 @@ hcpptest_suite("ActsBundleMgrTest") {
"${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # 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") import("//test/xts/tools/lite/build/suite_lite.gni")
...@@ -22,7 +22,7 @@ hctest_suite("ActsKitFwkApiTest") { ...@@ -22,7 +22,7 @@ hctest_suite("ActsKitFwkApiTest") {
"//test/xts/tools/lite/hctest/include", "//test/xts/tools/lite/hctest/include",
"//third_party/unity/src", "//third_party/unity/src",
"//utils/native/lite/include", "//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/bounds_checking_function/include/",
"//third_party/mbedtls/include/", "//third_party/mbedtls/include/",
"//third_party/cJSON/", "//third_party/cJSON/",
......
...@@ -64,7 +64,7 @@ lite_component("acts_component") { ...@@ -64,7 +64,7 @@ lite_component("acts_component") {
"//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest", "//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/hiviewdfx_lite/hilog_posix:ActsHilogTest",
"//test/xts/acts/appexecfwk_lite/appexecfwk_posix:ActsBundleMgrTest", "//test/xts/acts/appexecfwk_lite/appexecfwk_posix:ActsBundleMgrTest",
......
...@@ -28,10 +28,10 @@ hcpptest_suite("ActsDMSTest") { ...@@ -28,10 +28,10 @@ hcpptest_suite("ActsDMSTest") {
"//utils/native/lite/include", "//utils/native/lite/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/distributedschedule/dmsfwk_lite/include", "//foundation/systemabilitymgr/dmsfwk_lite/include",
"//foundation/distributedschedule/samgr_lite/interfaces/innerkits", "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits",
"${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite",
"${aafwk_lite_path}/interfaces/kits/ability_lite", "${aafwk_lite_path}/interfaces/kits/ability_lite",
...@@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") { ...@@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") {
deps = [ deps = [
"${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr", "//foundation/systemabilitymgr/dmsfwk_lite:dtbschedmgr",
"//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -38,17 +38,16 @@ hctest_suite("ActsSamgrTest") { ...@@ -38,17 +38,16 @@ hctest_suite("ActsSamgrTest") {
"//test/xts/tools/hctest/include", "//test/xts/tools/hctest/include",
"//third_party/unity/src", "//third_party/unity/src",
"//kernel/liteos_m/kal", "//kernel/liteos_m/kal",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
"//foundation/distributedschedule/samgr_lite/samgr/adapter", "//foundation/systemabilitymgr/samgr_lite/samgr/adapter",
"//foundation/distributedschedule/samgr_lite/samgr/source", "//foundation/systemabilitymgr/samgr_lite/samgr/source",
"src", "src",
"utils", "utils",
] ]
public_deps = [ public_deps =
"//foundation/distributedschedule/samgr_lite/samgr/adapter:samgr_adapter", [ "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter" ]
]
defines = [ "UNITY_INCLUDE_CONFIG_H" ] defines = [ "UNITY_INCLUDE_CONFIG_H" ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -69,15 +69,15 @@ hcpptest_suite("ActsSamgrTest") { ...@@ -69,15 +69,15 @@ hcpptest_suite("ActsSamgrTest") {
"include", "include",
"//utils/native/native_lite/include", "//utils/native/native_lite/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
] ]
deps = [ deps = [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
"//foundation/distributedschedule/samgr_lite/communication/broadcast:broadcast", "//foundation/systemabilitymgr/samgr_lite/communication/broadcast:broadcast",
"//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
import("//build/ohos_var.gni") import("//build/ohos_var.gni")
group("distributedschedule") { group("systemabilitymgr") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ "dmsfwk:dmsfwk" ] deps = [ "dmsfwk:dmsfwk" ]
......
...@@ -26,7 +26,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") { ...@@ -26,7 +26,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
"//utils/native/lite/include", "//utils/native/lite/include",
"//test/xts/tools/lite/hctest/include", "//test/xts/tools/lite/hctest/include",
"//third_party/unity/src", "//third_party/unity/src",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
] ]
include_dirs += DEVICEAUTH_BASIC_DEPS_INC include_dirs += DEVICEAUTH_BASIC_DEPS_INC
......
...@@ -32,8 +32,8 @@ hcpptest_suite("ActsPMSTest") { ...@@ -32,8 +32,8 @@ hcpptest_suite("ActsPMSTest") {
"src", "src",
"include", "include",
"//utils/native/lite/include", "//utils/native/lite/include",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
"//base/security/permission_lite/interfaces/innerkits", "//base/security/permission_lite/interfaces/innerkits",
"//base/security/permission_lite/interfaces/kits", "//base/security/permission_lite/interfaces/kits",
"//base/security/permission_lite/services/pms_base/include", "//base/security/permission_lite/services/pms_base/include",
...@@ -46,8 +46,8 @@ hcpptest_suite("ActsPMSTest") { ...@@ -46,8 +46,8 @@ hcpptest_suite("ActsPMSTest") {
"${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
"//base/security/permission_lite/services:permission_lite", "//base/security/permission_lite/services:permission_lite",
"//build/lite/config/component/cJSON:cjson_shared", "//build/lite/config/component/cJSON:cjson_shared",
"//foundation/distributedschedule/samgr_lite/communication/broadcast", "//foundation/systemabilitymgr/samgr_lite/communication/broadcast",
"//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
......
...@@ -24,11 +24,11 @@ hcpptest_suite("ActsBootstrapTest") { ...@@ -24,11 +24,11 @@ hcpptest_suite("ActsBootstrapTest") {
"src", "src",
"//utils/native/native_lite/include", "//utils/native/native_lite/include",
"//third_party/bounds_checking_function/include/", "//third_party/bounds_checking_function/include/",
"//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
] ]
deps = [ deps = [
"//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -42,7 +42,7 @@ _all_test_packages = [ ...@@ -42,7 +42,7 @@ _all_test_packages = [
"${ACTS_ROOT}/settingsdata:settingsdata", "${ACTS_ROOT}/settingsdata:settingsdata",
"${ACTS_ROOT}/barrierfree:barrierfree", "${ACTS_ROOT}/barrierfree:barrierfree",
"${ACTS_ROOT}/customization:customization", "${ACTS_ROOT}/customization:customization",
"${ACTS_ROOT}/distributedschedule:distributedschedule", "${ACTS_ROOT}/distributedschedule:systemabilitymgr",
] ]
_all_test_packages_ivi = [ _all_test_packages_ivi = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册