diff --git a/bundle.json b/bundle.json index 830f38fbc3a18b92f31b9368d12eaa1356d2ea4a..385d5b511b980c52a035d07ef9925322b30ac4d3 100644 --- a/bundle.json +++ b/bundle.json @@ -34,7 +34,7 @@ "hiviewdfx_hilog_native", "input", "graphic_standard", - "samgr_standard", + "samgr", "safwk", "hitrace_native", "c_utils", diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index b105eda88f090e845231dc6d58c6fda8cddcb1f9..4d3ad6def2c5c870f6262058ff535a9149312430 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -50,7 +50,7 @@ ohos_shared_library("distributed_screen_sink_sdk") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware" diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index b98dbeaef3ff5eb2631dbec945a713ce6dd776cf..86122775ea37c2ad6d6f8dd894aaac61bd3aa9c7 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("distributed_screen_source_sdk") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware" diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn index 5000c382a7cf856753ceb99928cbdf5a2204e0c9..140a766a5f0ecf7d449f38374a12ea68ed67b3c1 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("HandlerInitSinkFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn index abaf00f7e82d0bb5421dcf859946cb3ede391f13..687e5b8d6ea63ed8f2cc074749a84ac53f425e4e 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("HandlerOnRemoteSinkSvrDiedFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn index 1a19325d9cd4a2efa9ec4bf91538d896352c122c..c248a0af915426458cfcd0d3143a01d85f2c50b6 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("HandlerSubscribeLocalHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn index d7b5171594834a2445ee7474bb5b8b02596ae469..2e00cf104b164b4f664659a6b4f156039fa7c013 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("HandlerUnsubscribeLocalHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn index 47dd1ace7faf31f66135ff0217c78175ffbd8ef8..7ad4c5bb16f36bed5a0c8d51083af44a844a0005 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("ProxyInitSinkFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn index 6f2231b23cb369c2b37bc8d869fe5823a4a9ae70..4f3951e7a99bd5b01d69dd0b8aa02f10ac8ec8bd 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("ProxySubscribeLocalHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn index 763abc88e71bf30430ea33d8c193b41dca458429..5d36af55082c7314d6a574d8d1afe8544ce3522a 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("ProxyUnsubscribeLocalHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn index b3d6bda01c6e4e36877a75e6b1923274b0c74e61..0ba80693c4dc83187758e1b174b9dc8f004c2c04 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("SinkProxyDScreenNotifyFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn index 63f9245ab9a7b33f88c65a6665b6080a19c34dd9..b9a36fc7f620c070bb26a4695229248dfefdea15 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("HandlerConfigDistributedHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn index 21827e4cad04c65b11b077989054d98b6ed4c51d..eefc55bf27b94894aef7d3e97b2afd5a47f0bb5f 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("HandlerInitSourceFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn index 335717074a25b9aee01576f9b4d1ccb5dbcb4f6f..3fb6293a3ec93e3c3e5a66e1c756d0270386f5f7 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("HandlerOnRemoteSourceSvrDiedFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn index 89012a0c917d24598377c7a61f7b4eaa163ed72e..91633c3a53a42e94240a66d2e1e86b1d54268607 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("HandlerRegisterDistributedHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn index 097f023ad135f223b34f171443f52e37e4e3970f..71f840bbd345468ec95ee05f54f8474a5503cc92 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("HandlerUnregisterDistributedHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn index f5cc440a017f48b644e8fe168195130b9237d14d..723d335033a5adf3a07ff3b665cfe0e5fa61e960 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("ProxyConfigDistributedHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn index 0fa4f3cde833eef8330c549f015b7b63f2189257..e2a8662debc873d1bc0e4e4f919eb5ca039e2aca 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("ProxyDScreenNotifyFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn index 48acfcca7b48c23f1a94b9b5bca741964dd95b27..07b6146568def0806677ae6d3b7b40dab545a397 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("ProxyInitSourceFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn index e92e80478f34babcf880eeb0ef8343030dc7c92b..57213789e3bb070f85f05759c7085cc7ab1b2070 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("ProxyRegisterDistributedHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn index ba6c4eb3f3b23dac618ccc0b01f53ed54e6aafa2..25ff5164a64a36acfc04240e886aa214c67cafa9 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("ProxyUnregisterDistributedHardwareFuzzTest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 95b51fea3814a5892c75548e058fbc1313ec9ca1..60e39f9fc055fb8d07d97b295a7ec6642b962ba5 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("ScreenSinkTest") { "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -63,7 +63,7 @@ ohos_unittest("ScreenSinkTest") { "ipc:ipc_core", "multimedia_player_framework:media_client", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index b2b7e63b39c79b212214d0266a410bb8f29510cf..1af27df651bde1433e8512efd5c499b4b4a48b3a 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -56,7 +56,7 @@ ohos_unittest("ScreenSourceTest") { "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -68,7 +68,7 @@ ohos_unittest("ScreenSourceTest") { "ipc:ipc_core", "multimedia_player_framework:media_client", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index b554f1588db69a60492e2e31c355acb6e6717aa1..0ed1a43aaea86caa97396da484dbfa20dbd567a3 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -35,8 +35,8 @@ ohos_shared_library("distributed_screen_handler") { "${common_path}:distributed_screen_utils", "${mediastandard_path}/interfaces/inner_api/native:media_client", "${windowmanager_path}/dm:libdm", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn index eacb439289456c83ffac9fcb3460de02e36ca51e..46b21fef11db772772143e0bc6350c38ff94e20f 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -53,8 +53,8 @@ ohos_fuzztest("PluginHardwareFuzzTest") { "${fwk_services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr", "${mediastandard_path}/interfaces/inner_api/native:media_client", "${windowmanager_path}/dm:libdm", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn index aa6b5eed25bdd84a63b82d029d37574cf73f2e5d..41698b80d3479f9be158b0fb86b56b399584dccf 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -53,8 +53,8 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { "${fwk_services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr", "${mediastandard_path}/interfaces/inner_api/native:media_client", "${windowmanager_path}/dm:libdm", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn index ccf32885e3e83da12d6ad79c1c6752b774f6212d..9ea8e19e3f759547b4b4500f09f3e240786cb703 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -53,8 +53,8 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { "${fwk_services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr", "${mediastandard_path}/interfaces/inner_api/native:media_client", "${windowmanager_path}/dm:libdm", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 8c4c048a272c5a6c7fa15b9ee2a95d4c85bcacf2..af113427fc7b7ccb9cacb19adcfe6be62b92a6de 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -39,8 +39,8 @@ ohos_shared_library("distributed_screen_client") { "${common_path}:distributed_screen_utils", "${graphicstandard_path}/frameworks/surface:surface", "${windowmanager_path}/wm:libwm", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 2d7f20312698ba1300f1d26ae8001cfa9974f1a3..86acc1000ebc5a3c26cf076ceab05a49861bd788 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -45,8 +45,8 @@ ohos_executable("distributedScreenTest") { "${windowmanager_path}/wm:libwm", "//foundation/communication/dsoftbus/adapter:softbus_adapter", "//foundation/communication/dsoftbus/sdk:softbus_client", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 57e7f66985f43f91465411f291437f8a08db6280..2f017051ca6b702536d7979c63a9fc8941c2d241 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -75,7 +75,7 @@ ohos_shared_library("distributed_screen_sink") { "ipc:ipc_core", "multimedia_player_framework:media_client", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 9937c87879940fc8acf15267962076c353f930af..773779c85070d1d52e9675b7028ebc8a3512be65 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -79,7 +79,7 @@ ohos_shared_library("distributed_screen_source") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware"