!5948 修改不合理依赖问题联调修改

Merge pull request !5948 from duyulu/master
2024-11-23 06:50:40 +00:00 · 2024-04-26 09:41:59 +00:00 · 2024-04-26 09:41:59 +00:00 · 64b9c112fd
commit 64b9c112fd
parent 6bc9c25098 137c9d2949
41 changed files with 54 additions and 3 deletions
--- a/bundle.json
+++ b/bundle.json
@ -37,6 +37,7 @@
          "hisysevent",
          "ability_runtime",
          "napi",
+          "node",
          "common_event_service",
          "hilog",
          "access_token",
--- a/dm/BUILD.gn
+++ b/dm/BUILD.gn
@ -72,6 +72,7 @@ ohos_static_library("libdm_static") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
  ]

@ -121,6 +122,7 @@ ohos_shared_library("libdm") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
  ]

--- a/dm/test/unittest/BUILD.gn
+++ b/dm/test/unittest/BUILD.gn
@ -210,6 +210,7 @@ ohos_static_library("dm_unittest_common") {
  public_deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "${window_base_path}/wm:libwm",
    "../../../dmserver:libdms",
--- a/dm_lite/test/unittest/BUILD.gn
+++ b/dm_lite/test/unittest/BUILD.gn
@ -104,6 +104,7 @@ ohos_static_library("dm_unittest_common_lite") {
    "${window_base_path}/dm:libdm",
    "${window_base_path}/dm_lite:libdm_lite",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "${window_base_path}/wm:libwm",
    "../../../dmserver:libdms",
--- a/dmserver/BUILD.gn
+++ b/dmserver/BUILD.gn
@ -60,6 +60,7 @@ ohos_shared_library("libdms") {
  public_configs = [ ":libdms_public_config" ]

  deps = [
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "../utils:libwmutil",
  ]
--- a/dmserver/test/unittest/BUILD.gn
+++ b/dmserver/test/unittest/BUILD.gn
@ -232,6 +232,7 @@ ohos_static_library("dmserver_unittest_common") {
  public_deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "${window_base_path}/wm:libwm",
    "../..:libdms",
--- a/interfaces/kits/napi/common/BUILD.gn
+++ b/interfaces/kits/napi/common/BUILD.gn
@ -27,7 +27,6 @@ config("dm_napi_common_config") {
 config("dm_napi_common_public_config") {
  include_dirs = [
    ".",
-    "../../../../../../../third_party/node/src",
    "../../../innerkits/dm",
  ]
 }
@ -54,6 +53,7 @@ ohos_static_library("dm_napi_common") {

  deps = [
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
  ]

@ -64,6 +64,7 @@ ohos_static_library("dm_napi_common") {
    "hilog:libhilog",
    "ipc:ipc_single",
    "napi:ace_napi",
+    "node:node_header_notice",
  ]

  subsystem_name = "window"
--- a/interfaces/kits/napi/display_runtime/BUILD.gn
+++ b/interfaces/kits/napi/display_runtime/BUILD.gn
@ -47,6 +47,7 @@ ohos_shared_library("display_napi") {
  deps = [
    "../../../../dm:libdm",
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../common:dm_napi_common",
  ]

--- a/interfaces/kits/napi/embeddable_window_stage/BUILD.gn
+++ b/interfaces/kits/napi/embeddable_window_stage/BUILD.gn
@ -89,6 +89,7 @@ ohos_shared_library("embeddablewindowstage_kit") {
  include_dirs = [ "embeddable_window_stage" ]
  deps = [
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
    "../extension_window:extensionwindow_napi",
  ]
--- a/interfaces/kits/napi/extension_window/BUILD.gn
+++ b/interfaces/kits/napi/extension_window/BUILD.gn
@ -93,6 +93,7 @@ ohos_shared_library("extensionwindow_napi") {
  include_dirs = [ "extension_window" ]
  deps = [
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
    "../window_runtime:window_native_kit",
  ]
--- a/interfaces/kits/napi/picture_in_picture_napi/BUILD.gn
+++ b/interfaces/kits/napi/picture_in_picture_napi/BUILD.gn
@ -42,6 +42,7 @@ ohos_shared_library("pipwindow_napi") {
  deps = [
    "../../../../dm:libdm",
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
  ]

--- a/interfaces/kits/napi/picture_in_picture_napi/inner/BUILD.gn
+++ b/interfaces/kits/napi/picture_in_picture_napi/inner/BUILD.gn
@ -40,6 +40,7 @@ ohos_shared_library("pip_napi") {
  deps = [
    "../../../../../dm:libdm",
    "../../../../../utils:libwmutil",
+    "../../../../../utils:libwmutil_base",
    "../../../../../wm:libwm",
  ]

--- a/interfaces/kits/napi/screen_runtime/BUILD.gn
+++ b/interfaces/kits/napi/screen_runtime/BUILD.gn
@ -43,6 +43,7 @@ ohos_shared_library("screen_napi") {
  deps = [
    "../../../../dm:libdm",
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
  ]

  external_deps = [
--- a/interfaces/kits/napi/window_runtime/BUILD.gn
+++ b/interfaces/kits/napi/window_runtime/BUILD.gn
@ -62,6 +62,7 @@ ohos_shared_library("window_native_kit") {

  deps = [
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
  ]

@ -118,6 +119,7 @@ ohos_shared_library("window_napi") {
    ":window_native_kit",
    "../../../../dm:libdm",
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
  ]

@ -159,6 +161,7 @@ ohos_shared_library("windowstage_kit") {
  deps = [
    ":window_native_kit",
    "../../../../utils:libwmutil",
+    "../../../../utils:libwmutil_base",
    "../../../../wm:libwm",
  ]

--- a/snapshot/test/unittest/BUILD.gn
+++ b/snapshot/test/unittest/BUILD.gn
@ -78,6 +78,7 @@ ohos_static_library("utils_unittest_common") {
    "../../../dm:libdm",
    "../../../test/common/utils:libtestutil",
    "../../../utils:libwmutil",
+    "../../../utils:libwmutil_base",
    "//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",
--- a/test/demo/BUILD.gn
+++ b/test/demo/BUILD.gn
@ -53,6 +53,7 @@ ohos_executable("demo_screenshot_listener") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
  ]

  external_deps = [
--- a/test/fuzztest/dms/screen_fuzzer/BUILD.gn
+++ b/test/fuzztest/dms/screen_fuzzer/BUILD.gn
@ -37,6 +37,7 @@ ohos_fuzztest("ScreenFuzzTest") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
  ]
  external_deps = [
--- a/test/fuzztest/window_scene/scenesessionmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/window_scene/scenesessionmanager_fuzzer/BUILD.gn
@ -36,6 +36,7 @@ ohos_fuzztest("SceneSessionManagerFuzzTest") {
  sources = [ "scenesessionmanager_fuzzer.cpp" ]
  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/session_manager:session_manager",
  ]
--- a/test/fuzztest/window_scene/screensessionmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/window_scene/screensessionmanager_fuzzer/BUILD.gn
@ -37,6 +37,7 @@ ohos_fuzztest("ScreenSessionManagerFuzzTest") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/session_manager:session_manager",
  ]
--- a/test/fuzztest/window_scene/sessioninterface_fuzzer/BUILD.gn
+++ b/test/fuzztest/window_scene/sessioninterface_fuzzer/BUILD.gn
@ -38,6 +38,7 @@ ohos_fuzztest("SessionInterfaceFuzzTest") {
  sources = [ "sessioninterface_fuzzer.cpp" ]
  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/session:scene_session",
    "${window_base_path}/window_scene/session_manager:session_manager",
--- a/test/fuzztest/wms/pip_fuzzer/BUILD.gn
+++ b/test/fuzztest/wms/pip_fuzzer/BUILD.gn
@ -49,6 +49,7 @@ ohos_fuzztest("PipFuzzTest") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/wm:libwm",
  ]

--- a/test/fuzztest/wms/window_fuzzer/BUILD.gn
+++ b/test/fuzztest/wms/window_fuzzer/BUILD.gn
@ -52,6 +52,7 @@ ohos_fuzztest("WindowFuzzTest") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/wm:libwm",
  ]

--- a/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn
@ -36,6 +36,7 @@ ohos_fuzztest("WindowManagerFuzzTest") {
  sources = [ "windowmanager_fuzzer.cpp" ]
  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/wm:libwm",
  ]

--- a/test/fuzztest/wms/windowutilmath_fuzzer/BUILD.gn
+++ b/test/fuzztest/wms/windowutilmath_fuzzer/BUILD.gn
@ -38,6 +38,7 @@ ohos_fuzztest("WindowUtilMathFuzzTest") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/wm:libwm",
    "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
  ]
--- a/test/systemtest/dms/BUILD.gn
+++ b/test/systemtest/dms/BUILD.gn
@ -179,6 +179,7 @@ ohos_static_library("dms_systemtest_common") {
  public_deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "${window_base_path}/wm:libwm",
    "../../../dmserver:libdms",
--- a/test/systemtest/wms/BUILD.gn
+++ b/test/systemtest/wms/BUILD.gn
@ -493,6 +493,7 @@ ohos_static_library("wms_systemtest_common") {
    "${window_base_path}/dm:libdm",
    "${window_base_path}/dmserver:libdms",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "${window_base_path}/wm:libwm",
    "//commonlibrary/c_utils/base:utils",
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@ -166,7 +166,7 @@ ohos_shared_library("libwmutil") {

  public_configs = [ ":libwmutil_public_config" ]

-  public_deps = [ ":libwmutil_base" ]
+  deps = [ ":libwmutil_base" ]

  external_deps = [
    "ability_base:want",
--- a/utils/test/unittest/BUILD.gn
+++ b/utils/test/unittest/BUILD.gn
@ -277,6 +277,7 @@ ohos_static_library("utils_unittest_common") {
  public_deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/wm:libwm",
    "//commonlibrary/c_utils/base:utils",
    "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
--- a/window_scene/intention_event/BUILD.gn
+++ b/window_scene/intention_event/BUILD.gn
@ -32,6 +32,7 @@ ohos_shared_library("libintention_event") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "../common:window_scene_common",
    "../session:scene_session",
    "../session_manager:scene_session_manager",
--- a/window_scene/interfaces/kits/napi/scene_session_manager/BUILD.gn
+++ b/window_scene/interfaces/kits/napi/scene_session_manager/BUILD.gn
@ -40,6 +40,7 @@ ohos_shared_library("scenesessionmanager_napi") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/session:scene_session",
    "${window_base_path}/window_scene/session_manager:scene_session_manager",
--- a/window_scene/interfaces/kits/napi/screen_session_manager/BUILD.gn
+++ b/window_scene/interfaces/kits/napi/screen_session_manager/BUILD.gn
@ -36,6 +36,7 @@ ohos_shared_library("screensessionmanager_napi") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/screen_session_manager:screen_session_manager_client",
    "${window_base_path}/window_scene/session:screen_session",
    "${window_base_path}/wm:libwm",
--- a/window_scene/interfaces/kits/napi/session_manager_service/BUILD.gn
+++ b/window_scene/interfaces/kits/napi/session_manager_service/BUILD.gn
@ -43,6 +43,7 @@ ohos_shared_library("sessionmanagerservice_napi") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/session_manager_service:session_manager_service",
  ]

--- a/window_scene/interfaces/kits/napi/transaction_manager/BUILD.gn
+++ b/window_scene/interfaces/kits/napi/transaction_manager/BUILD.gn
@ -37,6 +37,7 @@ ohos_shared_library("transactionmanager_napi") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/session_manager:scene_session_manager",
  ]
--- a/window_scene/screen_session_manager/BUILD.gn
+++ b/window_scene/screen_session_manager/BUILD.gn
@ -45,6 +45,7 @@ ohos_shared_library("screen_session_manager_client") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/session:screen_session",
  ]

--- a/window_scene/session/BUILD.gn
+++ b/window_scene/session/BUILD.gn
@ -67,6 +67,7 @@ ohos_shared_library("scene_session") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/intention_event/service:intention_event_anr_manager",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
@ -148,7 +149,10 @@ ohos_shared_library("screen_session") {

  public_configs = [ ":session_public_config" ]

-  deps = [ "${window_base_path}/utils:libwmutil" ]
+  deps = [
+    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
+  ]

  external_deps = [
    "c_utils:utils",
--- a/window_scene/session_manager/BUILD.gn
+++ b/window_scene/session_manager/BUILD.gn
@ -92,6 +92,7 @@ ohos_shared_library("scene_session_manager") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/intention_event/service:intention_event_anr_manager",
    "${window_base_path}/window_scene/screen_session_manager:screen_session_manager_client",
@ -231,6 +232,7 @@ ohos_shared_library("screen_session_manager") {
  ]
  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "${window_base_path}/window_scene/session:screen_session",
@ -314,6 +316,7 @@ ohos_shared_library("session_manager") {
  deps = [
    ":session_manager_lite",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
  ]
  public_external_deps = [
    "ability_runtime:session_handler",
--- a/window_scene/test/unittest/BUILD.gn
+++ b/window_scene/test/unittest/BUILD.gn
@ -970,6 +970,7 @@ ohos_static_library("ws_unittest_common") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/intention_event/service:intention_event_anr_manager",
    "${window_base_path}/window_scene/screen_session_manager:screen_session_manager_client",
@ -987,6 +988,7 @@ ohos_static_library("ws_unittest_common") {
  public_deps = [
    "${graphic_base_path}/graphic_2d/rosen/modules/render_service_client:librender_service_client",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
  ]

  external_deps = [
--- a/wm/BUILD.gn
+++ b/wm/BUILD.gn
@ -97,6 +97,7 @@ ohos_static_library("libwm_static") {
  deps = [
    "${window_base_path}/dm:libdm",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/intention_event:libintention_event",
    "${window_base_path}/window_scene/intention_event/service:intention_event_anr_manager",
@ -241,6 +242,7 @@ ohos_shared_library("libwm") {
  public_configs = [ ":libwm_public_config" ]

  deps = [
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/intention_event:libintention_event",
    "${window_base_path}/window_scene/intention_event/service:intention_event_anr_manager",
--- a/wm/test/unittest/BUILD.gn
+++ b/wm/test/unittest/BUILD.gn
@ -508,6 +508,7 @@ ohos_static_library("wm_unittest_common") {
    "${window_base_path}/dm:libdm",
    "${window_base_path}/dmserver:libdms",
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/common:window_scene_common",
    "${window_base_path}/window_scene/session:scene_session",
    "${window_base_path}/window_scene/session_manager:scene_session_manager",
--- a/wmserver/BUILD.gn
+++ b/wmserver/BUILD.gn
@ -95,6 +95,7 @@ ohos_shared_library("sms") {

  deps = [
    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/utils:libwmutil_base",
    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
    "../utils:libwmutil",
  ]
@ -202,6 +203,7 @@ if (scene_board_enabled) {
      "../dmserver:libdms",
      "../etc:wms_etc",
      "../utils:libwmutil",
+      "../utils:libwmutil_base",
      "../wm:libwm",
    ]

--- a/wmserver/test/unittest/BUILD.gn
+++ b/wmserver/test/unittest/BUILD.gn
@ -83,6 +83,7 @@ test_public_deps = [
 test_inner_deps = [
  "${window_base_path}/dm:libdm",
  "${window_base_path}/utils:libwmutil",
+  "${window_base_path}/utils:libwmutil_base",
  "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
  "${window_base_path}/wm:libwm",
  "${window_base_path}/wmserver:sms",