openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-08-27 05:41:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify deps to external deps

Browse Source 
Signed-off-by: xiahaiqin <xiahaiqin1@huawei.com>
Change-Id: Ifdb1d31e3b2ec1bafe532059c4059cf0e87dfd6c
This commit is contained in:
xiahaiqin
2022-01-21 17:40:09 +08:00
parent 4fab00f438
commit 478d028d88
17 changed files with 81 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle.json
+17
View File
@@ -12,6 +12,23 @@
"ram": {},
"deps": {
"components": [
"libhilog",
"ipc_core",
"system_ability_fwk",
"samgr_proxy",
"image_native",
"utils",
"bytrace_core",
"surface",
"ability_context_native",
"ability_manager",
"want",
"ace_uicontent",
"appexecfwk_base",
"appexecfwk_core",
"inputmethod_client",
"libmmi-client",
"ace_napi"
],
"third_party": [
]
dm/BUILD.gn
+4 -8
View File
@@ -14,8 +14,6 @@
import("//build/ohos.gni")
config("libdm_private_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"../dmserver/include",
@@ -54,19 +52,17 @@ ohos_shared_library("libdm") {
public_configs = [ ":libdm_public_config" ]
deps = [
# RSSurface
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//utils/native/base:utils",
]
external_deps = [
"hilog_native:libhilog",
"ipc:ipc_core",
"multimedia_image_standard:image_native",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "window_manager"
dm/test/systemtest/BUILD.gn
+1
View File
@@ -102,6 +102,7 @@ ohos_static_library("dm_systemtest_common") {
public_configs = [ ":dm_systemtest_common_public_config" ]
public_deps = [
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
dm/test/unittest/BUILD.gn
+1
View File
@@ -95,6 +95,7 @@ ohos_static_library("dm_unittest_common") {
public_configs = [ ":dm_unittest_common_public_config" ]
public_deps = [
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native", # PixelMap
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
dmserver/BUILD.gn
+7 -4
View File
@@ -50,24 +50,27 @@ ohos_shared_library("libdms") {
public_configs = [ ":libdms_public_config" ]
deps = [
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//utils/native/base:utils",
# RSSurface
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
# todo need delete it
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/windowmanager/wmserver:libwms",
# need delete end
]
external_deps = [
"bytrace_standard:bytrace_core",
"graphic_standard:surface",
"hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "window_manager"
interfaces/innerkits/wm/window_scene.h
+4 -1
View File
@@ -18,11 +18,14 @@
#include <refbase.h>
#include <iremote_object.h>
#include <configuration.h>
#include "window.h"
#include "window_option.h"
namespace OHOS::AppExecFwk {
class Configuration;
}
namespace OHOS {
namespace Rosen {
class WindowScene : public RefBase {
interfaces/kits/napi/display/BUILD.gn
+3
View File
@@ -20,10 +20,13 @@ ohos_shared_library("display") {
deps = [
"../common:wm_napi_common",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
]
external_deps = [ "multimedia_image_standard:image_native" ]
relative_install_dir = "module"
part_name = "window_manager"
subsystem_name = "window"
interfaces/kits/napi/screenshot/BUILD.gn
+2 -2
View File
@@ -19,8 +19,6 @@ ohos_shared_library("screenshot") {
deps = [
"../common:wm_napi_common",
"//foundation/multimedia/image_standard/interfaces/innerkits:image",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
@@ -29,6 +27,8 @@ ohos_shared_library("screenshot") {
external_deps = [
"ability_runtime:runtime",
"hiviewdfx_hilog_native:libhilog",
"multimedia_image_standard:image",
"multimedia_image_standard:image_native",
"napi:ace_napi",
]
interfaces/kits/napi/window_runtime/BUILD.gn
+2
View File
@@ -73,12 +73,14 @@ ohos_shared_library("window_napi") {
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
"//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
"//foundation/aafwk/standard/interfaces/innerkits/want:want",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
]
external_deps = [
"ability_runtime:ability_manager",
"ability_runtime:runtime",
"hiviewdfx_hilog_native:libhilog",
"napi:ace_napi",
snapshot/BUILD.gn
+5 -2
View File
@@ -28,12 +28,15 @@ ohos_executable("snapshot_display") {
configs = [ ":snapshot_config" ]
deps = [
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native", # PixelMap
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//third_party/libpng:libpng", # png
"//utils/native/base:utils",
]
external_deps = [
"multimedia_image_standard:image_native",
"utils_base:utils",
]
part_name = "window_manager"
utils/BUILD.gn
+1 -2
View File
@@ -40,12 +40,11 @@ ohos_shared_library("libwmutil") {
public_configs = [ ":libwmutil_public_config" ]
deps = [ "//utils/native/base:utils" ]
external_deps = [
"bytrace_standard:bytrace_core",
"hilog_native:libhilog",
"ipc:ipc_core",
"utils_base:utils",
]
part_name = "window_manager"
wm/BUILD.gn
+10 -15
View File
@@ -67,37 +67,32 @@ ohos_shared_library("libwm") {
public_configs = [ ":libwm_public_config" ]
deps = [
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//utils/native/base:utils",
# ace
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
# vsync
"//foundation/graphic/standard:libvsync_client",
# todo need delete it for abilitycontext
"//foundation/ace/napi:ace_napi",
]
external_deps = [
"ability_runtime:ability_context_native",
"ability_runtime:ability_manager",
"ability_runtime:want",
"ace_engine_standard:ace_uicontent",
"appexecfwk_standard:appexecfwk_base",
"appexecfwk_standard:appexecfwk_core",
"bytrace_standard:bytrace_core",
"graphic_standard:surface",
"hilog_native:libhilog",
"inputmethod_native:inputmethod_client",
"ipc:ipc_core",
"multimedia_image_standard:image_native",
"multimodalinput_base:libmmi-client",
"window_manager:libdm",
"napi:ace_napi",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "window_manager"
wm/src/window_scene.cpp
+2
View File
@@ -14,6 +14,8 @@
*/
#include "window_scene.h"
#include <configuration.h>
#include "static_call.h"
#include "window_impl.h"
#include "window_manager_hilog.h"
wm/test/systemtest/BUILD.gn
+3 -2
View File
@@ -116,6 +116,8 @@ config("wm_systemtest_common_public_config") {
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//third_party/jsoncpp/include",
"//third_party/json/include",
# abilityContext end
]
@@ -142,6 +144,7 @@ ohos_static_library("wm_systemtest_common") {
# todo need delete it for abilitycontext
"//foundation/ace/napi:ace_napi",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
@@ -152,7 +155,5 @@ ohos_static_library("wm_systemtest_common") {
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]
external_deps = [ "ability_runtime:ability_context_native" ]
}
## Build wm_systemtest_common.a }}}
wm/test/unittest/BUILD.gn
+4
View File
@@ -140,6 +140,8 @@ config("wm_unittest_common_public_config") {
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
"//third_party/jsoncpp/include",
"//third_party/json/include",
# abilityContext end
]
@@ -163,8 +165,10 @@ ohos_static_library("wm_unittest_common") {
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
# todo need delete it for abilitycontext
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/ace/napi:ace_napi",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
wmserver/BUILD.gn
+13 -19
View File
@@ -66,35 +66,29 @@ ohos_shared_library("libwms") {
configs = [ ":libwms_config" ]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//base/notification/ces_standard/frameworks/native:cesfwk_innerkits",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
"//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//utils/native/base:utils",
]
public_deps = [
# ability manager
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/aafwk/standard/interfaces/innerkits/want:want",
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
# RSSurface
"//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
# IMS
# IMS libdms need delete it
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/utils:libwmutil",
]
external_deps = [
"ability_runtime:ability_manager",
"ability_runtime:want",
"bytrace_standard:bytrace_core",
"ces_standard:cesfwk_innerkits",
"graphic_standard:surface",
"hilog_native:libhilog",
"ipc:ipc_core",
"multimodalinput_base:libmmi-client",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "window_manager"
wmtest/BUILD.gn
+2 -1
View File
@@ -55,7 +55,6 @@ ohos_executable("rosenwmtest") {
configs = [ ":rosenwmtest_config" ]
deps = [
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/standard:libvsync_client",
"//foundation/graphic/standard:libwmclient",
"//foundation/graphic/standard:libwmservice",
@@ -70,6 +69,8 @@ ohos_executable("rosenwmtest") {
"//foundation/ace/napi:ace_napi",
]
external_deps = [ "samgr_standard:samgr_proxy" ]
part_name = "window_manager"
subsystem_name = "window"
}