diff --git a/interfaces/innerkits/wm/window.h b/interfaces/innerkits/wm/window.h index 09493ff2..70f6b416 100644 --- a/interfaces/innerkits/wm/window.h +++ b/interfaces/innerkits/wm/window.h @@ -24,7 +24,7 @@ #include #include #include -#include "foundation/appexecfwk/standard/kits/appkit/native/ability_runtime/context/context.h" +#include "foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/context.h" #include "wm_common.h" #include "window_option.h" #include "window_life_cycle_interface.h" diff --git a/interfaces/kits/napi/screenshot/BUILD.gn b/interfaces/kits/napi/screenshot/BUILD.gn index 4fddfe6d..53726a51 100644 --- a/interfaces/kits/napi/screenshot/BUILD.gn +++ b/interfaces/kits/napi/screenshot/BUILD.gn @@ -24,7 +24,7 @@ ohos_shared_library("screenshot") { ] external_deps = [ - "aafwk_standard:runtime", + "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", "window_manager:libwm", diff --git a/interfaces/kits/napi/window/BUILD.gn b/interfaces/kits/napi/window/BUILD.gn index 449bfb7f..93c5e88f 100644 --- a/interfaces/kits/napi/window/BUILD.gn +++ b/interfaces/kits/napi/window/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("window") { deps = [ "../common:wm_napi_common", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/appexecfwk/standard/kits:appkit_native", + "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/windowmanager/wm:libwm", "//foundation/windowmanager/wmserver:libwms", ] diff --git a/interfaces/kits/napi/window_runtime/BUILD.gn b/interfaces/kits/napi/window_runtime/BUILD.gn index 6ba32f61..71420a23 100644 --- a/interfaces/kits/napi/window_runtime/BUILD.gn +++ b/interfaces/kits/napi/window_runtime/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("window_native_kit") { ] external_deps = [ - "aafwk_standard:runtime", + "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", ] @@ -71,15 +71,15 @@ ohos_shared_library("windowmanager_napi") { deps = [ ":window_native_kit", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/appexecfwk/standard/kits:app_context", - "//foundation/appexecfwk/standard/kits:appkit_native", + "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", + "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", "//foundation/windowmanager/wmserver:libwms", ] external_deps = [ - "aafwk_standard:runtime", + "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", ] diff --git a/wm/BUILD.gn b/wm/BUILD.gn index b76389b0..d2874a78 100644 --- a/wm/BUILD.gn +++ b/wm/BUILD.gn @@ -26,6 +26,7 @@ config("libwm_config") { # for abilityContext "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include", + "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//base/global/resmgr_standard/interfaces/innerkits/include", "//third_party/node/deps/icu-small/source/common", @@ -127,12 +128,12 @@ ohos_shared_library("libwm") { # context + "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/kits:app_context", ] external_deps = [ - "aafwk_standard:ability_context_native", + "ability_runtime:ability_context_native", "bytrace_standard:bytrace_core", "inputmethod_native:inputmethod_client", "ipc:ipc_core", diff --git a/wm/test/systemtest/BUILD.gn b/wm/test/systemtest/BUILD.gn index e60a6e5c..0717277c 100644 --- a/wm/test/systemtest/BUILD.gn +++ b/wm/test/systemtest/BUILD.gn @@ -136,6 +136,6 @@ ohos_static_library("wm_systemtest_common") { "//utils/native/base:utils", ] - external_deps = [ "aafwk_standard:ability_context_native" ] + external_deps = [ "ability_runtime:ability_context_native" ] } ## Build wm_systemtest_common.a }}} diff --git a/wm/test/unittest/BUILD.gn b/wm/test/unittest/BUILD.gn index fc996b04..fc1fc3d0 100644 --- a/wm/test/unittest/BUILD.gn +++ b/wm/test/unittest/BUILD.gn @@ -159,6 +159,6 @@ ohos_static_library("wm_unittest_common") { "//utils/native/base:utils", ] - external_deps = [ "aafwk_standard:ability_context_native" ] + external_deps = [ "ability_runtime:ability_context_native" ] } ## Build wm_unittest_common.a }}}