diff --git a/bundle.json b/bundle.json old mode 100644 new mode 100755 index f7594eb..525a711 --- a/bundle.json +++ b/bundle.json @@ -33,7 +33,7 @@ "hiviewdfx_hilog_native", "ipc", "safwk", - "samgr_standard", + "samgr", "dsoftbus", "utils_base", "distributed_hardware_fwk" diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn old mode 100644 new mode 100755 index 7b4087f..cfb72a6 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -76,7 +76,7 @@ ohos_unittest("distributed_input_white_list_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn old mode 100644 new mode 100755 index f343f2d..628d073 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -50,7 +50,7 @@ ohos_shared_library("libdinput_dfx_utils") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn old mode 100644 new mode 100755 index 40eeb02..c8a8a6a --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -50,7 +50,7 @@ ohos_shared_library("libdinput_handler") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "dsoftbus:softbus_client", ] diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn old mode 100644 new mode 100755 index 1581104..d4771f5 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -75,7 +75,7 @@ ohos_shared_library("libdinput_sdk") { external_deps = [ "ipc:ipc_core", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "dsoftbus:softbus_client", ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn old mode 100644 new mode 100755 index fba5d62..7dd612d --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -93,7 +93,7 @@ ohos_unittest("distributed_input_inner_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "dsoftbus:softbus_client", ] diff --git a/low_latency/BUILD.gn b/low_latency/BUILD.gn old mode 100644 new mode 100755 index a373a6b..b139944 --- a/low_latency/BUILD.gn +++ b/low_latency/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("libdinput_low_latency") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn old mode 100644 new mode 100755 index 533c769..d10b29c --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -49,7 +49,7 @@ ohos_shared_library("libdinput_collector") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn old mode 100644 new mode 100755 index d33bef4..fe73801 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -76,7 +76,7 @@ ohos_shared_library("libdinput_sink") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn old mode 100644 new mode 100755 index 5dd292c..a06cce7 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -99,7 +99,7 @@ ohos_unittest("distributed_input_sinkmanager_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn old mode 100644 new mode 100755 index f860c40..bce59a0 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -51,7 +51,7 @@ ohos_shared_library("libdinput_sink_trans") { deps = [ "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", @@ -64,7 +64,7 @@ ohos_shared_library("libdinput_sink_trans") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn old mode 100644 new mode 100755 index ada8aae..fe0dc53 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -77,7 +77,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn old mode 100644 new mode 100755 index 14cb9ef..bc3b79c --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -56,7 +56,7 @@ ohos_shared_library("libdinput_inject") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn old mode 100644 new mode 100755 index da65f0f..cb7b021 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -82,7 +82,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn old mode 100644 new mode 100755 index ec74a94..e792990 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -96,7 +96,7 @@ ohos_shared_library("libdinput_source") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn old mode 100644 new mode 100755 index bda70cd..4291ace --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -123,7 +123,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn old mode 100644 new mode 100755 index d6045bc..193398d --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("libdinput_source_trans") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hitrace_native:hitrace_meter", ] diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn old mode 100644 new mode 100755 index a899997..cd4f21c --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -80,7 +80,7 @@ ohos_unittest("distributed_input_sourcetrans_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hitrace_native:hitrace_meter", ] diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn old mode 100644 new mode 100755 index 865a399..fc514a3 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -58,7 +58,7 @@ ohos_shared_library("libdinput_sink_handler") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn old mode 100644 new mode 100755 index 9065592..680f75f --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -79,7 +79,7 @@ ohos_unittest("distributed_input_sink_handler_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn old mode 100644 new mode 100755 index d917dab..18bab0b --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -58,7 +58,7 @@ ohos_shared_library("libdinput_source_handler") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn old mode 100644 new mode 100755 index 6ccb9bf..dd17b5a --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -79,7 +79,7 @@ ohos_unittest("distributed_input_source_handler_test") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hisysevent_native:libhisysevent", ] diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn old mode 100644 new mode 100755 index f0cbd91..a8f622b --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -74,7 +74,7 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] defines = [ diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn old mode 100644 new mode 100755 index 63ee339..bb4cb09 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -74,7 +74,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] defines = [ diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn old mode 100644 new mode 100755 index b48cce9..c7b2551 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] defines = [ diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn old mode 100644 new mode 100755 index 9678ee2..a8913b7 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -70,7 +70,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "hiviewdfx_hilog_native:libhilog", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "hitrace_native:hitrace_meter", ]