From ceba4bf8e7cea5888e15806edf86c16d8d866a1f Mon Sep 17 00:00:00 2001 From: zhangbirong Date: Wed, 7 Jun 2023 15:26:21 +0800 Subject: [PATCH] fix BUILD.gn dependence Signed-off-by: zhangbirong Change-Id: I5b821fb82aded42ac7c1dee1811b68eb1bc8d6d6 --- dm/BUILD.gn | 2 +- dm/test/unittest/BUILD.gn | 9 +++-- dmserver/test/unittest/BUILD.gn | 8 ++--- extension/extension_connection/BUILD.gn | 8 ++--- extension/window_extension/BUILD.gn | 2 +- interfaces/innerkits/BUILD.gn | 12 +++---- interfaces/kits/napi/BUILD.gn | 1 - interfaces/kits/napi/common/BUILD.gn | 2 +- interfaces/kits/napi/display_runtime/BUILD.gn | 4 +-- interfaces/kits/napi/window_runtime/BUILD.gn | 4 +-- snapshot/test/unittest/BUILD.gn | 7 ++-- test/demo/BUILD.gn | 33 ++++++++++--------- .../dms/displaymanager_fuzzer/BUILD.gn | 15 ++++----- test/fuzztest/dms/screen_fuzzer/BUILD.gn | 13 ++++---- .../dms/screenmanager_fuzzer/BUILD.gn | 15 ++++----- test/fuzztest/wms/windowagent_fuzzer/BUILD.gn | 5 ++- test/fuzztest/wms/windowipc_fuzzer/BUILD.gn | 8 ++--- .../wms/windowmanager_fuzzer/BUILD.gn | 1 - test/fuzztest/wms/windowscene_fuzzer/BUILD.gn | 5 ++- .../wms/windowutilmath_fuzzer/BUILD.gn | 5 ++- test/systemtest/dms/BUILD.gn | 11 +++---- test/systemtest/wms/BUILD.gn | 10 +++--- window_scene/session_manager_service/BUILD.gn | 2 +- wm/BUILD.gn | 4 +-- wmserver/BUILD.gn | 3 +- 25 files changed, 82 insertions(+), 107 deletions(-) diff --git a/dm/BUILD.gn b/dm/BUILD.gn index 0602424936..010849cbee 100644 --- a/dm/BUILD.gn +++ b/dm/BUILD.gn @@ -95,11 +95,11 @@ ohos_shared_library("libdm") { "${window_base_path}/window_scene/interfaces/innerkits:libwsutils", "${window_base_path}/window_scene/session_manager:session_manager", "../utils:libwmutil", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] external_deps = [ "c_utils:utils", + "graphic_standard:librender_service_client", "hilog_native:libhilog", "ipc:ipc_single", "multimedia_image_framework:image_native", diff --git a/dm/test/unittest/BUILD.gn b/dm/test/unittest/BUILD.gn index 30e32ceec8..02ab280de6 100644 --- a/dm/test/unittest/BUILD.gn +++ b/dm/test/unittest/BUILD.gn @@ -129,7 +129,6 @@ config("dm_unittest_common_public_config") { "../../../interfaces/innerkits/dm", "../../../test/common/utils/include", "../../../utils/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client", # RSSurface ] } @@ -150,10 +149,6 @@ ohos_static_library("dm_unittest_common") { "../../../dmserver:libdms", "../../../snapshot:snapshot_display", "../../../test/common/utils:libtestutil", - "//commonlibrary/c_utils/base:utils", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", # PixelMap - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//third_party/libjpeg-turbo:turbojpeg_static", @@ -163,8 +158,12 @@ ohos_static_library("dm_unittest_common") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "c_utils:utils", + "graphic_standard:librender_service_client", "hilog_native:libhilog", + "input:libmmi-client", "ipc:ipc_single", + "multimedia_image_framework:image_native", ] subsystem_name = "window" part_name = "window_manager" diff --git a/dmserver/test/unittest/BUILD.gn b/dmserver/test/unittest/BUILD.gn index f177da2f17..e4a653a9ad 100644 --- a/dmserver/test/unittest/BUILD.gn +++ b/dmserver/test/unittest/BUILD.gn @@ -147,7 +147,6 @@ config("dmserver_unittest_common_public_config") { "../../../test/common/mock", "../../../test/common/utils/include", "../../../utils/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client", # RSSurface "//base/sensors/sensor/interfaces/native/include", ] } @@ -169,10 +168,7 @@ ohos_static_library("dmserver_unittest_common") { "../..:libdms", "../../../snapshot:snapshot_display", "../../../test/common/utils:libtestutil", - "//commonlibrary/c_utils/base:utils", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", # PixelMap - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//third_party/libjpeg-turbo:turbojpeg_static", # jpeg @@ -182,8 +178,12 @@ ohos_static_library("dmserver_unittest_common") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "c_utils:utils", + "graphic_standard:surface", "hilog_native:libhilog", + "input:libmmi-client", "ipc:ipc_single", + "multimedia_image_framework:image_native", "sensor:sensor_interface_native", ] subsystem_name = "window" diff --git a/extension/extension_connection/BUILD.gn b/extension/extension_connection/BUILD.gn index 542ae74a4d..9ff7e2290b 100644 --- a/extension/extension_connection/BUILD.gn +++ b/extension/extension_connection/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") config("libwindow_extension_client_private_config") { visibility = [ ":*" ] - visibility += [ "//foundation/arkui/ace_engine/frameworks/core/components_ng/test/pattern/ability_component/*" ] + visibility += [ "../../../../arkui/ace_engine/frameworks/core/components_ng/test/pattern/ability_component/*" ] include_dirs = [ "include", @@ -44,14 +44,12 @@ ohos_shared_library("libwindow_extension_client") { public_configs = [ ":libextension_connection_public_config" ] - deps = [ - "../../wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - ] + deps = [ "../../wm:libwm" ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "graphic_standard:librender_service_client", "hitrace_native:hitrace_meter", "input:libmmi-client", "ipc:ipc_single", diff --git a/extension/window_extension/BUILD.gn b/extension/window_extension/BUILD.gn index 3ebe16f2ff..a21cc6df5d 100644 --- a/extension/window_extension/BUILD.gn +++ b/extension/window_extension/BUILD.gn @@ -50,7 +50,6 @@ ohos_shared_library("libwindow_extension") { "${ability_runtime_path}/frameworks/native/appkit:app_context", "../../interfaces/kits/napi/window_runtime:window_native_kit", "../../wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] external_deps = [ @@ -62,6 +61,7 @@ ohos_shared_library("libwindow_extension") { "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "graphic_standard:librender_service_client", "hilog_native:libhilog", "hitrace_native:hitrace_meter", "input:libmmi-client", diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 81138de747..ef0988030b 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -23,12 +23,12 @@ ohos_shared_library("wm_interface") { include_dirs = [ "../../interfaces/innerkits" ] - public_deps = [ - "//commonlibrary/c_utils/base:utils", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_client", + "input:libmmi-client", + "multimedia_image_framework:image_native", + "samgr:samgr_proxy", ] part_name = "window_manager" diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index b9e7f71ea0..944edb0058 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -11,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/ts2panda/ts2abc_config.gni") import("//build/ohos.gni") group("napi_packages") { diff --git a/interfaces/kits/napi/common/BUILD.gn b/interfaces/kits/napi/common/BUILD.gn index 173502bbc1..a8fc1a7ac7 100644 --- a/interfaces/kits/napi/common/BUILD.gn +++ b/interfaces/kits/napi/common/BUILD.gn @@ -45,7 +45,6 @@ ohos_static_library("dm_napi_common") { deps = [ "../../../../utils:libwmutil", "../../../../wm:libwm", - "//foundation/arkui/napi:ace_napi", ] external_deps = [ @@ -53,6 +52,7 @@ ohos_static_library("dm_napi_common") { "bundle_framework:appexecfwk_base", "hilog_native:libhilog", "ipc:ipc_single", + "napi:ace_napi", ] subsystem_name = "window" diff --git a/interfaces/kits/napi/display_runtime/BUILD.gn b/interfaces/kits/napi/display_runtime/BUILD.gn index f905d6d83e..ab617498f5 100644 --- a/interfaces/kits/napi/display_runtime/BUILD.gn +++ b/interfaces/kits/napi/display_runtime/BUILD.gn @@ -20,9 +20,6 @@ config("display_config") { include_dirs = [ ".", "../../../../utils/include", - - # because of pixle_map.h - "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] } @@ -51,6 +48,7 @@ ohos_shared_library("display_napi") { "c_utils:utils", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "multimedia_image_framework:image_native", "napi:ace_napi", ] diff --git a/interfaces/kits/napi/window_runtime/BUILD.gn b/interfaces/kits/napi/window_runtime/BUILD.gn index 8ddc3023be..b2277cbc0d 100644 --- a/interfaces/kits/napi/window_runtime/BUILD.gn +++ b/interfaces/kits/napi/window_runtime/BUILD.gn @@ -37,9 +37,6 @@ config("window_native_kit_config") { "../../../../wm/include", "../../../../utils/include", "../../../../wmserver/include", - - # because of pixle_map.h - "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] } @@ -137,6 +134,7 @@ ohos_shared_library("windowstage_kit") { "ability_runtime:runtime", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", + "multimedia_image_framework:image_native", "napi:ace_napi", ] diff --git a/snapshot/test/unittest/BUILD.gn b/snapshot/test/unittest/BUILD.gn index 20b2949967..7745a733cf 100644 --- a/snapshot/test/unittest/BUILD.gn +++ b/snapshot/test/unittest/BUILD.gn @@ -49,7 +49,6 @@ config("utils_unittest_common_public_config") { "../../include", "../../../test/common/utils/include", "../../../utils/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", ] } @@ -69,9 +68,7 @@ ohos_static_library("utils_unittest_common") { "../../../test/common/utils:libtestutil", "../../../utils:libwmutil", "//commonlibrary/c_utils/base:utils", - "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -80,6 +77,10 @@ ohos_static_library("utils_unittest_common") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "c_utils:utils", + "graphic_standard:2d_graphics", + "graphic_standard:librender_service_base", + "graphic_standard:librender_service_client", "hilog_native:libhilog", "ipc:ipc_single", ] diff --git a/test/demo/BUILD.gn b/test/demo/BUILD.gn index 1fcfb52a48..a9fb58cec9 100644 --- a/test/demo/BUILD.gn +++ b/test/demo/BUILD.gn @@ -32,12 +32,12 @@ ohos_executable("demo_mirror_screen_listener") { include_dirs = [ "../common/utils/include" ] - deps = [ - "${window_base_path}/dm:libdm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base", - ] + deps = [ "${window_base_path}/dm:libdm" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_base", + ] part_name = "window_manager" subsystem_name = "window" @@ -78,9 +78,10 @@ ohos_executable("demo_snapshot_virtual_screen") { "${window_base_path}/dm:libdm_static", "${window_base_path}/utils:libwmutil_static", "../../snapshot:libsnapshot_util", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] + external_deps = [ "graphic_standard:librender_service_client" ] + part_name = "window_manager" subsystem_name = "window" } @@ -93,12 +94,12 @@ ohos_executable("demo_system_sub_window") { "../common/utils/include", ] - deps = [ - "${window_base_path}/wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base", - ] + deps = [ "${window_base_path}/wm:libwm" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_base", + ] part_name = "window_manager" subsystem_name = "window" @@ -127,12 +128,12 @@ ohos_executable("demo_water_mark_listener") { "${window_base_path}/test/common/utils/include", ] - deps = [ - "${graphic_base_path}/graphic_2d/rosen/modules/render_service_base:librender_service_base", - "${window_base_path}/wm:libwm", - ] + deps = [ "${window_base_path}/wm:libwm" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_base", + ] part_name = "window_manager" subsystem_name = "window" diff --git a/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn b/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn index ba48c07d11..de0fcd1517 100644 --- a/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ module_output_path = "window_manager/dms" ohos_fuzztest("DisplayManagerFuzzTest") { fuzz_config_file = "." module_out_path = module_output_path - include_dirs = [ - "../../../../interfaces/innerkits/dm", - "//commonlibrary/c_utils/base/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - ] + include_dirs = [ "../../../../interfaces/innerkits/dm" ] configs = [ "../..:configs_cc_ld", @@ -33,11 +29,12 @@ ohos_fuzztest("DisplayManagerFuzzTest") { ] sources = [ "displaymanager_fuzzer.cpp" ] - deps = [ - "${window_base_path}/dm:libdm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + deps = [ "${window_base_path}/dm:libdm" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_client", + "graphic_standard:surface", ] - external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/test/fuzztest/dms/screen_fuzzer/BUILD.gn b/test/fuzztest/dms/screen_fuzzer/BUILD.gn index c26133a795..532531c211 100644 --- a/test/fuzztest/dms/screen_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/screen_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ module_output_path = "window_manager/dms" ohos_fuzztest("ScreenFuzzTest") { fuzz_config_file = "." module_out_path = module_output_path - include_dirs = [ - "../../../../interfaces/innerkits/dm", - "//commonlibrary/c_utils/base/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - ] + include_dirs = [ "../../../../interfaces/innerkits/dm" ] configs = [ "../..:configs_cc_ld", @@ -37,9 +33,12 @@ ohos_fuzztest("ScreenFuzzTest") { deps = [ "${window_base_path}/dm:libdm", "${window_base_path}/utils:libwmutil", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_client", + "graphic_standard:surface", + ] } ############################################################################### diff --git a/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn b/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn index be97984a9d..ecaf600390 100644 --- a/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn @@ -21,11 +21,7 @@ module_output_path = "window_manager/dms" ohos_fuzztest("ScreenManagerFuzzTest") { fuzz_config_file = "." module_out_path = module_output_path - include_dirs = [ - "../../../../interfaces/innerkits/dm", - "//commonlibrary/c_utils/base/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - ] + include_dirs = [ "../../../../interfaces/innerkits/dm" ] configs = [ "../..:configs_cc_ld", @@ -33,11 +29,12 @@ ohos_fuzztest("ScreenManagerFuzzTest") { ] sources = [ "screenmanager_fuzzer.cpp" ] - deps = [ - "${window_base_path}/dm:libdm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + deps = [ "${window_base_path}/dm:libdm" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:librender_service_client", + "graphic_standard:surface", ] - external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn b/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn index de74d0c0db..0ad1a6d901 100644 --- a/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn @@ -27,12 +27,10 @@ ohos_fuzztest("WindowAgentFuzzTest") { "../../../../wmserver/include", "../../../../interfaces/innerkits/wm", "../../../../interfaces/innerkits/dm", - "//commonlibrary/c_utils/base/include", # for abilityContext "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", - "//base/global/resource_management/interfaces/inner_api/include", "//third_party/node/deps/icu-small/source/common", "${ability_runtime_inner_api_path}/ability_manager/include", @@ -51,7 +49,6 @@ ohos_fuzztest("WindowAgentFuzzTest") { "${window_base_path}/wm:libwm", ] - public_deps = [ "//foundation/arkui/napi:ace_napi" ] external_deps = [ "ability_base:base", "ability_base:want", @@ -65,6 +62,8 @@ ohos_fuzztest("WindowAgentFuzzTest") { "input:libmmi-client", "ipc:ipc_single", "multimedia_image_framework:image_native", + "napi:ace_napi", + "resource_management:global_resmgr", ] } diff --git a/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn b/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn index e533284f4f..06629d1287 100644 --- a/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn @@ -34,14 +34,12 @@ ohos_fuzztest("WindowIPCFuzzTest") { ] sources = [ "windowipc_fuzzer.cpp" ] - deps = [ - "${window_base_path}/wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - ] + deps = [ "${window_base_path}/wm:libwm" ] external_deps = [ "ability_runtime:ability_manager", + "graphic_standard:librender_service_client", + "graphic_standard:window_animation", "input:libmmi-client", "ipc:ipc_single", "samgr:samgr_proxy", diff --git a/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn b/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn index 28d5e4987a..f607a2c24a 100644 --- a/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("WindowManagerFuzzTest") { include_dirs = [ "../../../../wmserver/include", "../../../../interfaces/innerkits/wm", - "//commonlibrary/c_utils/base/include", ] configs = [ diff --git a/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn b/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn index abf8664b6d..63276c800a 100644 --- a/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn @@ -25,8 +25,6 @@ ohos_fuzztest("WindowSceneFuzzTest") { "../../../../wmserver/include", "../../../../interfaces/innerkits/dm", "../../../../interfaces/innerkits/wm", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - "//commonlibrary/c_utils/base/include", ] configs = [ @@ -38,11 +36,12 @@ ohos_fuzztest("WindowSceneFuzzTest") { deps = [ "${window_base_path}/dm:libdm", "${window_base_path}/wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] external_deps = [ "c_utils:utils", + "graphic_standard:librender_service_client", + "graphic_standard:surface", "ipc:ipc_single", ] } diff --git a/test/fuzztest/wms/windowutilmath_fuzzer/BUILD.gn b/test/fuzztest/wms/windowutilmath_fuzzer/BUILD.gn index 173aa15749..7d69eeed38 100644 --- a/test/fuzztest/wms/windowutilmath_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowutilmath_fuzzer/BUILD.gn @@ -26,8 +26,6 @@ ohos_fuzztest("WindowUtilMathFuzzTest") { "../../../../utils/include", "../../../../interfaces/innerkits/dm", "../../../../interfaces/innerkits/wm", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - "//commonlibrary/c_utils/base/include", ] configs = [ @@ -40,11 +38,12 @@ ohos_fuzztest("WindowUtilMathFuzzTest") { "${window_base_path}/dm:libdm", "${window_base_path}/utils:libwmutil", "${window_base_path}/wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] external_deps = [ "c_utils:utils", + "graphic_standard:librender_service_client", + "graphic_standard:surface", "ipc:ipc_single", ] } diff --git a/test/systemtest/dms/BUILD.gn b/test/systemtest/dms/BUILD.gn index f239f2e16a..e9b2f99862 100644 --- a/test/systemtest/dms/BUILD.gn +++ b/test/systemtest/dms/BUILD.gn @@ -105,10 +105,6 @@ config("dms_systemtest_common_public_config") { "../../../interfaces/innerkits/wm", "../../common/utils/include", "../../../utils/include", - - # RSSurface - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client", ] } @@ -130,9 +126,6 @@ ohos_static_library("dms_systemtest_common") { "${window_base_path}/wm:libwm", "../../../dmserver:libdms", "../../common/utils:libtestutil", - "//commonlibrary/c_utils/base:utils", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -141,7 +134,11 @@ ohos_static_library("dms_systemtest_common") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "c_utils:utils", + "graphic_standard:librender_service_client", + "graphic_standard:surface", "hilog_native:libhilog", + "input:libmmi-client", "ipc:ipc_single", ] subsystem_name = "window" diff --git a/test/systemtest/wms/BUILD.gn b/test/systemtest/wms/BUILD.gn index 4fc814c73f..6e88081bf9 100644 --- a/test/systemtest/wms/BUILD.gn +++ b/test/systemtest/wms/BUILD.gn @@ -328,16 +328,11 @@ config("wms_systemtest_common_public_config") { "${window_base_path}/wmserver/include", "${window_base_path}/interfaces/innerkits/wm", "${window_base_path}/utils/include", - "//commonlibrary/c_utils/base/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/googletest/googlemock/include", - "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include", # for abilityContext "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", - "//base/global/resource_management/interfaces/inner_api/include", "//third_party/node/deps/icu-small/source/common", "${ability_runtime_inner_api_path}/ability_manager/include", @@ -366,7 +361,6 @@ ohos_static_library("wms_systemtest_common") { "${window_base_path}/dmserver:libdms", "${window_base_path}/utils:libwmutil", "${window_base_path}/wm:libwm", - "//commonlibrary/c_utils/base:utils", "//foundation/arkui/napi:ace_napi", "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", @@ -380,8 +374,12 @@ ohos_static_library("wms_systemtest_common") { "ability_base:zuri", "ability_runtime:ability_context_native", "bundle_framework:appexecfwk_base", + "c_utils:utils", + "graphic_standard:2d_graphics", + "hilog_native:libhilog", "ipc:ipc_single", "power_manager:powermgr_client", + "resource_management:global_resmgr", ] part_name = "window_manager" diff --git a/window_scene/session_manager_service/BUILD.gn b/window_scene/session_manager_service/BUILD.gn index c91dab8e08..9168dd8810 100644 --- a/window_scene/session_manager_service/BUILD.gn +++ b/window_scene/session_manager_service/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/window/window_manager/windowmanager_aafwk.gni") +import("../../windowmanager_aafwk.gni") config("session_manager_service_public_config") { include_dirs = [ diff --git a/wm/BUILD.gn b/wm/BUILD.gn index 62ec8fc8c0..8dc3527018 100644 --- a/wm/BUILD.gn +++ b/wm/BUILD.gn @@ -70,7 +70,6 @@ ohos_static_library("libwm_static") { public_configs = [ ":libwm_public_config" ] deps = [ - "${graphic_base_path}/graphic_2d/rosen/modules/render_service_client:librender_service_client", "${window_base_path}/dm:libdm", "${window_base_path}/utils:libwmutil", "${window_base_path}/window_scene/common:window_scene_common", @@ -84,6 +83,7 @@ ohos_static_library("libwm_static") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", + "graphic_standard:librender_service_client", "graphic_standard:window_animation", "hilog_native:libhilog", "hisysevent_native:libhisysevent", @@ -178,7 +178,6 @@ ohos_shared_library("libwm") { "${window_base_path}/window_scene/session_manager:session_manager", "../dm:libdm", "../utils:libwmutil", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] external_deps = [ @@ -187,6 +186,7 @@ ohos_shared_library("libwm") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", + "graphic_standard:librender_service_client", "graphic_standard:window_animation", "hilog_native:libhilog", "hisysevent_native:libhisysevent", diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn index 69d6eedea3..47fa2bd419 100644 --- a/wmserver/BUILD.gn +++ b/wmserver/BUILD.gn @@ -22,7 +22,6 @@ config("libwms_config") { "include/utils", "include/window_snapshot", "include/window_group", - "//utils/system/safwk/native/include", "../interfaces/innerkits/wm", "../interfaces/innerkits/dm", "../wm/include", @@ -90,7 +89,6 @@ ohos_shared_library("libwms") { "../etc:wms_etc", "../utils:libwmutil", "../wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//third_party/libxml2:libxml2", ] @@ -102,6 +100,7 @@ ohos_shared_library("libwms") { "config_policy:configpolicy_util", "display_manager:displaymgr", "eventhandler:libeventhandler", + "graphic_standard:librender_service_client", "graphic_standard:window_animation", "hicollie_native:libhicollie", "hilog_native:libhilog", -- Gitee