openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-08-26 21:31:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

split libwmutil

Browse Source 
Signed-off-by: xiahaiqin <xiahaiqin1@huawei.com>
Change-Id: I34d1d61aa6d3ef91d21db1ed941e5e4e3708b1a9
This commit is contained in:
xiahaiqin
2022-01-16 13:38:51 +08:00
parent a9766994cd
commit c4338216b9
17 changed files with 71 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle.json
+1 -1
View File
@@ -23,7 +23,7 @@
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/snapshot:snapshot_display",
"//foundation/windowmanager/interfaces/kits/napi:windowstage",
"//foundation/windowmanager/interfaces/kits/napi:napi_packages"
dm/BUILD.gn
+2 -2
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2021 Huawei Device Co., Ltd.
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -56,7 +56,7 @@ ohos_shared_library("libdm") {
"//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/wm:libwmutil",
"//foundation/windowmanager/utils:libwmutil",
"//utils/native/base:utils",
]
interfaces/kits/napi/screenshot/BUILD.gn
+2 -2
View File
@@ -20,14 +20,14 @@ ohos_shared_library("screenshot") {
deps = [
"../common:wm_napi_common",
"//foundation/multimedia/image_standard/interfaces/innerkits:image",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/utils:libwmutil",
]
external_deps = [
"aafwk_standard:runtime",
"hiviewdfx_hilog_native:libhilog",
"napi:ace_napi",
"window_manager:libwm",
]
relative_install_dir = "module"
interfaces/kits/napi/window_runtime/BUILD.gn
+2 -2
View File
@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
import("//build/ohos.gni")
@@ -37,8 +37,8 @@ ohos_shared_library("windowmanager_napi") {
configs = [ ":window_manager_napi_config" ]
deps = [
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/wmserver:libwms",
]
snapshot/BUILD.gn
+1 -1
View File
@@ -30,8 +30,8 @@ ohos_executable("snapshot_display") {
deps = [
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native", # PixelMap
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wm:libwmutil",
"//third_party/libpng:libpng", # png
]
utils/BUILD.gn
+53
View File
@@ -0,0 +1,53 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/ohos.gni")
config("libwmutil_private_config") {
include_dirs = [
"include",
"//foundation/windowmanager/dmserver/include",
"../interfaces/innerkits/dm",
"../interfaces/innerkits/wm",
]
}
config("libwmutil_public_config") {
include_dirs = [ "//foundation/windowmanager/utils/include" ]
}
## Build libwmutil.so
ohos_shared_library("libwmutil") {
sources = [
"src/display_info.cpp",
"src/singleton_container.cpp",
"src/virtual_display_info.cpp",
"src/window_property.cpp",
"src/wm_trace.cpp",
]
configs = [ ":libwmutil_private_config" ]
public_configs = [ ":libwmutil_public_config" ]
deps = [ "//utils/native/base:utils" ]
external_deps = [
"bytrace_standard:bytrace_core",
"hilog_native:libhilog",
"ipc:ipc_core",
]
part_name = "window_manager"
subsystem_name = "window"
}
dmserver/include/display_info.h → utils/include/display_info.h
View File
dmserver/include/virtual_display_info.h → utils/include/virtual_display_info.h
View File
wm/include/window_property.h → utils/include/window_property.h
View File
dmserver/src/display_info.cpp → utils/src/display_info.cpp
View File
dmserver/src/virtual_display_info.cpp → utils/src/virtual_display_info.cpp
View File
wm/src/window_property.cpp → utils/src/window_property.cpp
View File
wm/BUILD.gn
+2 -40
View File
@@ -68,45 +68,6 @@ config("libwm_public_config_test") {
include_dirs = [ "//foundation/windowmanager/interfaces/innerkits" ]
}
config("libwmutil_private_config") {
include_dirs = [
"include",
"//foundation/windowmanager/dmserver/include",
"../interfaces/innerkits/dm",
"../interfaces/innerkits/wm",
]
}
config("libwmutil_public_config") {
include_dirs = [ "//foundation/windowmanager/utils/include" ]
}
## Build libwmutil.so
ohos_shared_library("libwmutil") {
sources = [
"../dmserver/src/display_info.cpp",
"../dmserver/src/virtual_display_info.cpp",
"../utils/src/singleton_container.cpp",
"../utils/src/wm_trace.cpp",
"src/window_property.cpp",
]
configs = [ ":libwmutil_private_config" ]
public_configs = [ ":libwmutil_public_config" ]
deps = [ "//utils/native/base:utils" ]
external_deps = [
"bytrace_standard:bytrace_core",
"hilog_native:libhilog",
"ipc:ipc_core",
]
part_name = "window_manager"
subsystem_name = "window"
}
## Build libwm.so
ohos_shared_library("libwm") {
sources = [
@@ -145,7 +106,7 @@ ohos_shared_library("libwm") {
"//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/wm:libwmutil",
"//foundation/windowmanager/utils:libwmutil",
"//utils/native/base:utils",
# weston adapter
@@ -181,6 +142,7 @@ ohos_shared_library("libwm") {
"aafwk_standard:ability_context_native",
"bytrace_standard:bytrace_core",
"ipc:ipc_core",
"window_manager:libdm",
]
part_name = "window_manager"
wm/test/systemtest/BUILD.gn
+5 -5
View File
@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import("//build/test.gni")
@@ -35,7 +35,7 @@ ohos_systemtest("wm_window_layout_test") {
deps = [ ":wm_systemtest_common" ]
}
## SystemTest wm_window_layout_test }}}
## SystemTest wm_window_layout_test }}}
## SystemTest wm_window_multi_ability_test {{{
ohos_systemtest("wm_window_multi_ability_test") {
@@ -46,7 +46,7 @@ ohos_systemtest("wm_window_multi_ability_test") {
deps = [ ":wm_systemtest_common" ]
}
## SystemTest wm_window_multi_ability_test }}}
## SystemTest wm_window_multi_ability_test }}}
## SystemTest wm_window_subwindow_test {{{
ohos_systemtest("wm_window_subwindow_test") {
@@ -57,7 +57,7 @@ ohos_systemtest("wm_window_subwindow_test") {
deps = [ ":wm_systemtest_common" ]
}
## SystemTest wm_window_subwindow_test }}}
## SystemTest wm_window_subwindow_test }}}
## SystemTest wm_window_immersive_test {{{
ohos_systemtest("wm_window_immersive_test") {
@@ -116,8 +116,8 @@ ohos_static_library("wm_systemtest_common") {
public_deps = [
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/wmserver:libwms",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
wm/test/unittest/BUILD.gn
+1 -1
View File
@@ -137,8 +137,8 @@ ohos_static_library("wm_unittest_common") {
public_deps = [
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/wmserver:libwms",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
wmserver/BUILD.gn
+1 -1
View File
@@ -86,7 +86,7 @@ ohos_shared_library("libwms") {
# IMS
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/utils:libwmutil",
]
external_deps = [
wmtest/BUILD.gn
+1 -1
View File
@@ -60,8 +60,8 @@ ohos_executable("rosenwmtest") {
"//foundation/graphic/standard:libwmclient",
"//foundation/graphic/standard:libwmservice",
"//foundation/windowmanager/adapter:libwmadaptertest",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wm:libwmutil",
"//foundation/windowmanager/wmserver:libwms",
"//third_party/zlib:libz",