window gn rule fix

Signed-off-by: zhangbirong <zhangbirong@huawei.com>
Change-Id: I1b7a9b8df26df468644a3fac4f87d180451c21b8
This commit is contained in:
zhangbirong 2023-05-09 16:17:32 +08:00
parent f36894be32
commit efcaa38ad8
53 changed files with 347 additions and 353 deletions

View File

@ -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("libdm_private_config") {
include_dirs = [
@ -80,14 +80,14 @@ ohos_shared_library("libdm") {
configs = [
":libdm_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
public_configs = [ ":libdm_public_config" ]
deps = [
"../utils:libwmutil",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/utils:libwmutil",
]
external_deps = [

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/dm"
@ -68,7 +68,7 @@ ohos_unittest("dm_screenshot_test") {
ohos_unittest("dm_screen_manager_test") {
module_out_path = module_out_path
include_dirs = [ "//foundation/window/window_manager/dm/src" ]
include_dirs = [ "../../src" ]
sources = [ "screen_manager_test.cpp" ]
@ -102,7 +102,7 @@ ohos_unittest("dm_display_manager_adapter_test") {
ohos_unittest("dm_display_manager_test") {
module_out_path = module_out_path
include_dirs = [ "//foundation/window/window_manager/dm/src" ]
include_dirs = [ "../../src" ]
sources = [ "display_manager_test.cpp" ]
@ -120,15 +120,15 @@ ohos_unittest("dm_display_manager_agent_stub_test") {
## Build dm_unittest_common.a {{{
config("dm_unittest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/dm/include/zidl",
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/snapshot",
"//foundation/window/window_manager/test/common/mock",
"//foundation/window/window_manager/test/common/utils/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/test/common/utils/include",
"//foundation/window/window_manager/utils/include",
"../../include",
"../../include/zidl",
"../../../dmserver/include",
"../../../snapshot",
"../../../test/common/mock",
"../../../test/common/utils/include",
"../../../interfaces/innerkits/dm",
"../../../test/common/utils/include",
"../../../utils/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client", # RSSurface
]
}
@ -139,21 +139,21 @@ ohos_static_library("dm_unittest_common") {
public_configs = [
":dm_unittest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
public_deps = [
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../../../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",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/snapshot:snapshot_display",
"//foundation/window/window_manager/test/common/utils:libtestutil",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//third_party/libjpeg-turbo:turbojpeg_static",

View File

@ -12,13 +12,13 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../windowmanager_aafwk.gni")
## Build libdms.so
config("libdms_private_config") {
include_dirs = [
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../dm/include",
"../interfaces/innerkits/dm",
]
}
@ -47,14 +47,14 @@ ohos_shared_library("libdms") {
configs = [
":libdms_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
public_configs = [ ":libdms_public_config" ]
deps = [
"../utils:libwmutil",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/utils:libwmutil",
"//third_party/libxml2:libxml2",
]

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/dmserver"
@ -125,7 +125,7 @@ ohos_unittest("dmserver_abstract_display_controller_test") {
ohos_unittest("dmserver_display_manager_config_test") {
module_out_path = module_out_path
include_dirs = [ "//foundation/window/window_manager/dmserver/src" ]
include_dirs = [ "../../src" ]
sources = [ "display_manager_config_test.cpp" ]
@ -140,13 +140,13 @@ ohos_unittest("dmserver_display_manager_config_test") {
## Build dmserver_unittest_common.a {{{
config("dmserver_unittest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/snapshot",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/test/common/mock",
"//foundation/window/window_manager/test/common/utils/include",
"//foundation/window/window_manager/utils/include",
"../../../dm/include",
"../../include",
"../../../snapshot",
"../../../interfaces/innerkits/dm",
"../../../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",
]
@ -158,21 +158,21 @@ ohos_static_library("dmserver_unittest_common") {
public_configs = [
":dmserver_unittest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
public_deps = [
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../..: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",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/snapshot:snapshot_display",
"//foundation/window/window_manager/test/common/utils:libtestutil",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//third_party/libjpeg-turbo:turbojpeg_static", # jpeg

View File

@ -39,14 +39,14 @@ ohos_shared_library("libwindow_extension_client") {
configs = [
":libwindow_extension_client_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../resources/config/build:coverage_flags",
]
public_configs = [ ":libextension_connection_public_config" ]
deps = [
"../../wm:libwm",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/wm:libwm",
]
external_deps = [

View File

@ -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("libwindow_extension_private_config") {
visibility = [ ":*" ]
@ -42,15 +42,15 @@ ohos_shared_library("libwindow_extension") {
configs = [
":libwindow_extension_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../resources/config/build:coverage_flags",
]
deps = [
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${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",
"//foundation/window/window_manager/interfaces/kits/napi/window_runtime:window_native_kit",
"//foundation/window/window_manager/wm:libwm",
]
external_deps = [
@ -87,10 +87,10 @@ ohos_shared_library("window_extension_module") {
configs = [
":window_extension_module_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../resources/config/build:coverage_flags",
]
deps = [ "//foundation/window/window_manager/extension/window_extension:libwindow_extension" ]
deps = [ ":libwindow_extension" ]
external_deps = [
"ability_runtime:abilitykit_native",

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/extension/window_extension"
group("unittest") {
@ -32,13 +32,13 @@ ohos_unittest("extension_window_extension_proxy_test") {
## Build window_extension_unittest_common.a {{{
config("window_extension_unittest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/extension/window_extension/include",
"//foundation/window/window_manager/extension/window_extension/include/zidl",
"//foundation/window/window_manager/extension/extension_connection/include",
"//foundation/window/window_manager/extension/extension_connection/include/zidl",
"//foundation/window/window_manager/interfaces/innerkits/extension",
"../../../../interfaces/innerkits/wm",
"../../../../wm/include",
"../../include",
"../../include/zidl",
"../../../extension_connection/include",
"../../../extension_connection/include/zidl",
"../../../../interfaces/innerkits/extension",
"//third_party/googletest/googlemock/include",
]
}
@ -49,8 +49,8 @@ ohos_static_library("window_extension_unittest_common") {
public_configs = [
":window_extension_unittest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
public_deps = [
@ -63,10 +63,10 @@ ohos_static_library("window_extension_unittest_common") {
]
deps = [
"//foundation/window/window_manager/extension/extension_connection:libwindow_extension_client",
"//foundation/window/window_manager/extension/window_extension:libwindow_extension",
"//foundation/window/window_manager/interfaces/kits/napi/window_runtime:window_native_kit",
"//foundation/window/window_manager/wm:libwm",
"../..:libwindow_extension",
"../../../../interfaces/kits/napi/window_runtime:window_native_kit",
"../../../../wm:libwm",
"../../../extension_connection:libwindow_extension_client",
]
external_deps = [

View File

@ -15,13 +15,13 @@ import("//build/ohos.gni")
config("wm_interface_config") {
visibility = [ ":*" ]
include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits" ]
include_dirs = [ "../../interfaces/innerkits" ]
}
ohos_shared_library("wm_interface") {
public_configs = [ ":wm_interface_config" ]
include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits" ]
include_dirs = [ "../../interfaces/innerkits" ]
public_deps = [
"//commonlibrary/c_utils/base:utils",

View File

@ -26,4 +26,7 @@ ohos_copy("window_declaration") {
module_source_dir = target_out_dir + "/$target_name"
module_install_name = ""
part_name = "window_manager"
subsystem_name = "window"
}

View File

@ -28,7 +28,7 @@ config("dm_napi_common_public_config") {
include_dirs = [
".",
"//third_party/node/src",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../../innerkits/dm",
]
}
@ -37,15 +37,15 @@ ohos_static_library("dm_napi_common") {
configs = [
":dm_napi_common_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../../../resources/config/build:coverage_flags",
]
public_configs = [ ":dm_napi_common_public_config" ]
deps = [
"../../../../utils:libwmutil",
"../../../../wm:libwm",
"//foundation/arkui/napi:ace_napi",
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
]
external_deps = [

View File

@ -12,14 +12,14 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
config("display_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/kits/napi/display_runtime",
"//foundation/window/window_manager/utils/include",
".",
"../../../../utils/include",
# because of pixle_map.h
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
@ -37,13 +37,13 @@ ohos_shared_library("display_napi") {
configs = [
":display_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../../../resources/config/build:coverage_flags",
]
deps = [
"../../../../dm:libdm",
"../../../../utils:libwmutil",
"../common:dm_napi_common",
"//foundation/window/window_manager/dm:libdm",
"//foundation/window/window_manager/utils:libwmutil",
]
external_deps = [

View File

@ -13,15 +13,12 @@
import("//arkcompiler/ets_frontend/ts2panda/ts2abc_config.gni")
import("//build/ohos.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
config("screen_runtime_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/kits/napi/screen_runtime/api",
"//foundation/window/window_manager/interfaces/kits/napi/screen_runtime/napi",
]
include_dirs = [ "napi" ]
}
ohos_shared_library("screen_napi") {
@ -34,12 +31,12 @@ ohos_shared_library("screen_napi") {
configs = [
":screen_runtime_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../../../resources/config/build:coverage_flags",
]
deps = [
"//foundation/window/window_manager/dm:libdm",
"//foundation/window/window_manager/utils:libwmutil",
"../../../../dm:libdm",
"../../../../utils:libwmutil",
]
external_deps = [

View File

@ -17,13 +17,11 @@ import("//build/ohos.gni")
ohos_shared_library("screenshot") {
sources = [ "native_screenshot_module.cpp" ]
configs = [
"//foundation/window/window_manager/resources/config/build:coverage_flags",
]
configs = [ "../../../../resources/config/build:coverage_flags" ]
deps = [
"../../../../dm:libdm",
"../common:dm_napi_common",
"//foundation/window/window_manager/dm:libdm",
]
external_deps = [

View File

@ -37,9 +37,7 @@ gen_js_obj("window_extension_ability_abc") {
ohos_shared_library("windowextensionability_napi") {
sources = [ "window_extension_ability_module.cpp" ]
configs = [
"//foundation/window/window_manager/resources/config/build:coverage_flags",
]
configs = [ "../../../../resources/config/build:coverage_flags" ]
deps = [
":window_extension_ability_abc",

View File

@ -37,9 +37,7 @@ gen_js_obj("window_extension_context_abc") {
ohos_shared_library("windowextensioncontext_napi") {
sources = [ "window_extension_context_module.cpp" ]
configs = [
"//foundation/window/window_manager/resources/config/build:coverage_flags",
]
configs = [ "../../../../resources/config/build:coverage_flags" ]
deps = [
":window_extension_context_abc",

View File

@ -13,18 +13,18 @@
import("//arkcompiler/ets_frontend/ts2panda/ts2abc_config.gni")
import("//build/ohos.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
config("window_manager_napi_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_napi",
"//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_manager_napi",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/utils/include",
"window_napi",
"window_manager_napi",
"../../../innerkits/wm",
"../../../innerkits/dm",
"../../../../wm/include",
"../../../../utils/include",
]
}
@ -32,11 +32,11 @@ config("window_native_kit_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_napi",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/wmserver/include",
"window_napi",
"../../../innerkits/wm",
"../../../../wm/include",
"../../../../utils/include",
"../../../../wmserver/include",
# because of pixle_map.h
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
@ -54,12 +54,12 @@ ohos_shared_library("window_native_kit") {
configs = [
":window_native_kit_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../../../resources/config/build:coverage_flags",
]
deps = [
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
"../../../../utils:libwmutil",
"../../../../wm:libwm",
]
external_deps = [
@ -90,13 +90,13 @@ ohos_shared_library("window_napi") {
configs = [
":window_manager_napi_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../../../resources/config/build:coverage_flags",
]
deps = [
":window_native_kit",
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
"../../../../utils:libwmutil",
"../../../../wm:libwm",
]
external_deps = [
@ -121,14 +121,14 @@ ohos_shared_library("windowstage_kit") {
configs = [
":window_native_kit_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../../../../resources/config/build:coverage_flags",
]
include_dirs = [ "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_stage_napi" ]
include_dirs = [ "window_stage_napi" ]
deps = [
":window_native_kit",
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
"../../../../utils:libwmutil",
"../../../../wm:libwm",
]
external_deps = [

View File

@ -37,9 +37,7 @@ gen_js_obj("window_stage_abc") {
ohos_shared_library("windowstage") {
sources = [ "window_stage_module.cpp" ]
configs = [
"//foundation/window/window_manager/resources/config/build:coverage_flags",
]
configs = [ "../../../../../resources/config/build:coverage_flags" ]
deps = [
":window_stage_abc",

View File

@ -17,8 +17,8 @@ config("previewer_window_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/previewer/include",
"../interfaces/innerkits/wm",
"include",
]
}
@ -66,7 +66,7 @@ ohos_shared_library("previewer_window") {
config("previewer_window_napi_config") {
visibility = [ ":*" ]
include_dirs = [ "//foundation/window/window_manager/interfaces/kits/napi/window_runtime/window_napi" ]
include_dirs = [ "../interfaces/kits/napi/window_runtime/window_napi" ]
}
ohos_shared_library("previewer_window_napi") {
@ -130,4 +130,7 @@ ohos_copy("copy_previewer_library") {
[ target_out_dir + "/previewer/common/bin/libpreviewer_window" + suffix ]
module_source_dir = target_out_dir + "/previewer/common/bin/"
module_install_name = ""
part_name = "window_manager"
subsystem_name = "window"
}

View File

@ -12,19 +12,23 @@
# limitations under the License.
import("//build/ohos.gni")
declare_args() {
window_manager_dayu200_resource_config = true
}
declare_args() {
window_manager_dayu210_resource_config = true
}
ohos_prebuilt_etc("window_manager_config") {
if (device_name == "rk3568") {
source = "//foundation/window/window_manager/resources/config/rk3568/window_manager_config.xml"
if (window_manager_dayu200_resource_config) {
source = "./rk3568/window_manager_config.xml"
install_enable = true
} else if (window_manager_dayu210_resource_config) {
source = "./rk3588/window_manager_config.xml"
install_enable = true
} else {
source = "//foundation/window/window_manager/resources/config/other/window_manager_config.xml"
source = "./other/window_manager_config.xml"
install_enable = false
}
part_name = "window_manager"
@ -33,14 +37,14 @@ ohos_prebuilt_etc("window_manager_config") {
}
ohos_prebuilt_etc("display_manager_config") {
if (device_name == "rk3568") {
source = "//foundation/window/window_manager/resources/config/rk3568/display_manager_config.xml"
if (window_manager_dayu200_resource_config) {
source = "./rk3568/display_manager_config.xml"
install_enable = true
} else if (window_manager_dayu210_resource_config) {
source = "./rk3588/display_manager_config.xml"
install_enable = true
} else {
source = "//foundation/window/window_manager/resources/config/other/display_manager_config.xml"
source = "./other/display_manager_config.xml"
install_enable = false
}
part_name = "window_manager"

View File

@ -13,7 +13,7 @@
import("//build/ohos.gni")
ohos_prebuilt_etc("window_place_holder_image") {
source = "//foundation/window/window_manager/resources/media/img/bg_place_holder.png"
source = "./img/bg_place_holder.png"
part_name = "window_manager"
subsystem_name = "window"
relative_install_dir = "window/resources"

View File

@ -25,7 +25,7 @@ ohos_executable("snapshot_display") {
configs = [
":snapshot_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
deps = [
@ -47,11 +47,11 @@ ohos_shared_library("libsnapshot_util") {
configs = [
":snapshot_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
deps = [
"//foundation/window/window_manager/dm:libdm",
"../dm:libdm",
"//third_party/libjpeg-turbo:turbojpeg_static",
]

View File

@ -43,12 +43,12 @@ ohos_unittest("snapshot_display_test") {
## Build utils_unittest_common.a {{{
config("utils_unittest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/snapshot/include",
"//foundation/window/window_manager/test/common/utils/include",
"//foundation/window/window_manager/utils/include",
"../../../dmserver/include",
"../../../interfaces/innerkits/dm",
"../../../interfaces/innerkits/wm",
"../../include",
"../../../test/common/utils/include",
"../../../utils/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
]
}
@ -59,19 +59,19 @@ ohos_static_library("utils_unittest_common") {
public_configs = [
":utils_unittest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
public_deps = [
"../..:libsnapshot_util",
"../../../dm:libdm",
"../../../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",
"//foundation/window/window_manager/dm:libdm",
"//foundation/window/window_manager/snapshot:libsnapshot_util",
"//foundation/window/window_manager/test/common/utils:libtestutil",
"//foundation/window/window_manager/utils:libwmutil",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]

View File

@ -24,13 +24,11 @@ ohos_static_library("libtestutil") {
"src/screen_manager_utils.cpp",
]
include_dirs = [ "//foundation/window/window_manager/utils/include" ]
include_dirs = [ "../../../utils/include" ]
configs = [ ":libtestutil_private_config" ]
public_configs = [
"//foundation/window/window_manager/resources/config/build:coverage_flags",
]
public_configs = [ "../../../resources/config/build:coverage_flags" ]
external_deps = [
"access_token:libaccesstoken_sdk",

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../windowmanager_aafwk.gni")
group("demo") {
testonly = true
@ -30,8 +30,7 @@ group("demo") {
ohos_executable("demo_mirror_screen_listener") {
sources = [ "demo_mirror_screen_listener.cpp" ]
include_dirs =
[ "//foundation/window/window_manager/test/common/utils/include" ]
include_dirs = [ "../common/utils/include" ]
deps = [
"${window_base_path}/dm:libdm_static",
@ -47,8 +46,7 @@ ohos_executable("demo_mirror_screen_listener") {
ohos_executable("demo_screenshot_listener") {
sources = [ "demo_screenshot_listener.cpp" ]
include_dirs =
[ "//foundation/window/window_manager/test/common/utils/include" ]
include_dirs = [ "../common/utils/include" ]
deps = [
"${window_base_path}/dm:libdm_static",
@ -69,9 +67,9 @@ ohos_executable("demo_snapshot_virtual_screen") {
sources = [ "demo_snapshot_virtual_screen.cpp" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/snapshot/include",
"//foundation/window/window_manager/utils/include",
"../../interfaces/innerkits/dm",
"../../snapshot/include",
"../../utils/include",
"../../dmserver/include",
"../../dm/include",
]
@ -79,8 +77,8 @@ ohos_executable("demo_snapshot_virtual_screen") {
deps = [
"${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",
"//foundation/window/window_manager/snapshot:libsnapshot_util",
]
part_name = "window_manager"
@ -91,8 +89,8 @@ ohos_executable("demo_system_sub_window") {
sources = [ "demo_system_sub_window.cpp" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/test/common/utils/include",
"../../interfaces/innerkits/wm",
"../common/utils/include",
]
deps = [
@ -110,7 +108,7 @@ ohos_executable("demo_freeze_display") {
sources = [ "demo_freeze_display.cpp" ]
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../interfaces/innerkits/dm",
# pixel_map.h
"//foundation/multimedia/image_framework/interfaces/innerkits/include",

View File

@ -13,23 +13,23 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/dms"
##############################fuzztest##########################################
ohos_fuzztest("DisplayManagerFuzzTest") {
fuzz_config_file = "//foundation/window/window_manager/test/fuzztest/dms/displaymanager_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../../../interfaces/innerkits/dm",
"//commonlibrary/c_utils/base/include",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
]
sources = [ "displaymanager_fuzzer.cpp" ]

View File

@ -13,23 +13,23 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/dms"
##############################fuzztest##########################################
ohos_fuzztest("DisplayManagerIPCFuzzTest") {
fuzz_config_file = "//foundation/window/window_manager/test/fuzztest/dms/displaymanageripc_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/dm/include",
"../../../../interfaces/innerkits/dm",
"../../../../dmserver/include",
"../../../../dm/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
]
sources = [ "displaymanageripc_fuzzer.cpp" ]

View File

@ -13,25 +13,24 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/dms"
##############################fuzztest##########################################
ohos_fuzztest("ScreenFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/dms/screen_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../../../interfaces/innerkits/dm",
"//commonlibrary/c_utils/base/include",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "screen_fuzzer.cpp" ]

View File

@ -13,23 +13,23 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/dms"
##############################fuzztest##########################################
ohos_fuzztest("ScreenManagerFuzzTest") {
fuzz_config_file = "//foundation/window/window_manager/test/fuzztest/dms/screenmanager_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../../../interfaces/innerkits/dm",
"//commonlibrary/c_utils/base/include",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
]
sources = [ "screenmanager_fuzzer.cpp" ]

View File

@ -13,21 +13,20 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/wms/window_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../../../wm/include",
"../../../../dm/include",
"../../../../wmserver/include",
"../../../../interfaces/innerkits/wm",
"../../../../interfaces/innerkits/dm",
"//commonlibrary/c_utils/base/include",
# for abilityContext
@ -41,9 +40,9 @@ ohos_fuzztest("WindowFuzzTest") {
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "window_fuzzer.cpp" ]

View File

@ -13,21 +13,20 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowAgentFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/wms/windowagent_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"../../../../wm/include",
"../../../../dm/include",
"../../../../wmserver/include",
"../../../../interfaces/innerkits/wm",
"../../../../interfaces/innerkits/dm",
"//commonlibrary/c_utils/base/include",
# for abilityContext
@ -41,9 +40,9 @@ ohos_fuzztest("WindowAgentFuzzTest") {
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "window_agent_fuzzer.cpp" ]

View File

@ -13,30 +13,30 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowControllerFuzzTest") {
fuzz_config_file = "//foundation/window/window_manager/test/fuzztest/wms/windowcontroller_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/wmserver/include/window_snapshot",
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"../../../../wm/include",
"../../../../wmserver/include",
"../../../../wmserver/include/window_snapshot",
"../../../../dmserver/include",
"../../../../utils/include",
"../../../../interfaces/innerkits/dm",
"../../../../interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//commonlibrary/c_utils/base/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "windowcontroller_fuzzer.cpp" ]
@ -44,8 +44,8 @@ ohos_fuzztest("WindowControllerFuzzTest") {
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../../../../wmserver:libwms",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/wmserver:libwms",
]
external_deps = [

View File

@ -13,25 +13,24 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowIPCFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/wms/windowipc_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/wm/include",
"../../../../interfaces/innerkits/wm",
"../../../../interfaces/innerkits/dm",
"../../../../wmserver/include",
"../../../../wm/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
]
sources = [ "windowipc_fuzzer.cpp" ]

View File

@ -13,24 +13,24 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowManagerFuzzTest") {
fuzz_config_file = "//foundation/window/window_manager/test/fuzztest/wms/windowmanager_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"../../../../wmserver/include",
"../../../../interfaces/innerkits/wm",
"//commonlibrary/c_utils/base/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "windowmanager_fuzzer.cpp" ]

View File

@ -13,32 +13,31 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowPairFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/wms/windowpair_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"include",
"include/window_snapshot",
"//utils/system/safwk/native/include",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/dmserver/include",
"../../../../interfaces/innerkits/wm",
"../../../../interfaces/innerkits/dm",
"../../../../wm/include",
"../../../../wmserver/include",
"../../../../utils/include",
"../../../../dm/include",
"../../../../dmserver/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "windowpair_fuzzer.cpp" ]
@ -46,10 +45,10 @@ ohos_fuzztest("WindowPairFuzzTest") {
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../../../../dmserver:libdms",
"../../../../etc:wms_etc",
"../../../../wmserver:libwms",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/etc:wms_etc",
"//foundation/window/window_manager/wmserver:libwms",
"//third_party/libxml2:libxml2",
]

View File

@ -13,35 +13,34 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowRootFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/wms/windowroot_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/dm/include/zidl",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/wmserver/include/zidl",
"//foundation/window/window_manager/wmserver/include/window_snapshot",
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/snapshot/include",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"../../../../wm/include",
"../../../../dm/include",
"../../../../dm/include/zidl",
"../../../../wmserver/include",
"../../../../wmserver/include/zidl",
"../../../../wmserver/include/window_snapshot",
"../../../../dmserver/include",
"../../../../snapshot/include",
"../../../../utils/include",
"../../../../interfaces/innerkits/dm",
"../../../../interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//commonlibrary/c_utils/base/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
"../../../../resources/config/build:testcase_flags",
]
sources = [ "windowroot_fuzzer.cpp" ]
@ -50,9 +49,9 @@ ohos_fuzztest("WindowRootFuzzTest") {
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../../../../dmserver:libdms",
"../../../../wmserver:libwms",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/wmserver:libwms",
]
public_deps = [ "//foundation/arkui/napi:ace_napi" ]

View File

@ -13,26 +13,25 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowSceneFuzzTest") {
fuzz_config_file =
"//foundation/window/window_manager/test/fuzztest/wms/windowscene_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"../../../../wmserver/include",
"../../../../interfaces/innerkits/dm",
"../../../../interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//commonlibrary/c_utils/base/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
]
sources = [ "windowscene_fuzzer.cpp" ]

View File

@ -13,26 +13,26 @@
import("//build/config/features.gni")
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../../windowmanager_aafwk.gni")
module_output_path = "window_manager/wms"
##############################fuzztest##########################################
ohos_fuzztest("WindowUtilMathFuzzTest") {
fuzz_config_file = "//foundation/window/window_manager/test/fuzztest/wms/windowutilmath_fuzzer"
fuzz_config_file = "."
module_out_path = module_output_path
include_dirs = [
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"../../../../wmserver/include",
"../../../../utils/include",
"../../../../interfaces/innerkits/dm",
"../../../../interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//commonlibrary/c_utils/base/include",
]
configs = [
"//foundation/window/window_manager/test/fuzztest:configs_cc_ld",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../..:configs_cc_ld",
"../../../../resources/config/build:coverage_flags",
]
sources = [ "windowutilmath_fuzzer.cpp" ]

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/dms"
@ -99,12 +99,12 @@ ohos_systemtest("dms_screen_gamut_test") {
## Build dms_systemtest_common.a {{{
config("dms_systemtest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/test/common/utils/include",
"//foundation/window/window_manager/utils/include",
"../../../dm/include",
"../../../dmserver/include",
"../../../interfaces/innerkits/dm",
"../../../interfaces/innerkits/wm",
"../../common/utils/include",
"../../../utils/include",
# RSSurface
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
@ -120,19 +120,19 @@ ohos_static_library("dms_systemtest_common") {
public_configs = [
":dms_systemtest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
public_deps = [
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../../../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",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/test/common/utils:libtestutil",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]

View File

@ -22,9 +22,9 @@ group("systemtest") {
config("we_systemtest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/extension/extension_connection/include",
"//foundation/window/window_manager/interfaces/innerkits/extension",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"../../../extension/extension_connection/include",
"../../../interfaces/innerkits/extension",
"../../../interfaces/innerkits/wm",
"//third_party/googletest/googlemock/include",
]
}
@ -37,12 +37,12 @@ ohos_systemtest("window_extension_connection_test") {
public_configs = [
":we_systemtest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
public_deps = [
"//foundation/window/window_manager/extension/extension_connection:libwindow_extension_client",
"../../../extension/extension_connection:libwindow_extension_client",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/wms"
@ -383,5 +383,8 @@ ohos_static_library("wms_systemtest_common") {
"ipc:ipc_single",
"power_manager:powermgr_client",
]
part_name = "window_manager"
subsystem_name = "window"
}
## Build wms_systemtest_common.a }}}

View File

@ -12,11 +12,11 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../windowmanager_aafwk.gni")
config("libwmutil_private_config") {
include_dirs = [
"include",
"//foundation/window/window_manager/dmserver/include",
"../dmserver/include",
"../interfaces/innerkits/dm",
"../interfaces/innerkits/wm",
]
@ -24,7 +24,7 @@ config("libwmutil_private_config") {
config("libwmutil_public_config") {
include_dirs = [
"//foundation/window/window_manager/utils/include",
"include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
]
}
@ -115,7 +115,7 @@ ohos_shared_library("libwmutil") {
configs = [
":libwmutil_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
public_configs = [ ":libwmutil_public_config" ]

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/utils"
group("unittest") {
@ -172,13 +172,13 @@ ohos_unittest("utils_window_transition_info_test") {
## Build dm_unittest_common.a {{{
config("utils_unittest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/dmserver/include",
"//foundation/window/window_manager/test/common/mock",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/dm/include",
"../../../dmserver/include",
"../../../test/common/mock",
"../../../interfaces/innerkits/dm",
"../../../interfaces/innerkits/wm",
"../../include",
"../../../wm/include",
"../../../dm/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
]
}
@ -189,8 +189,8 @@ ohos_static_library("utils_unittest_common") {
public_configs = [
":utils_unittest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
public_deps = [

View File

@ -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("window_scene_common_public_config") {
include_dirs = [

View File

@ -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("libwsutils_public_config") {
include_dirs =

View File

@ -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("scene_session_manager_napi_public_config") {
visibility = [ ":*" ]

View File

@ -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("screen_session_manager_napi_public_config") {
visibility = [ ":*" ]

View File

@ -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_public_config") {
include_dirs = [

View File

@ -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_public_config") {
include_dirs = [

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/window_scene"
group("unittest") {

View File

@ -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("libwm_private_config") {
visibility = [ ":*" ]
@ -154,15 +154,15 @@ ohos_shared_library("libwm") {
configs = [
":libwm_private_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
public_configs = [ ":libwm_public_config" ]
deps = [
"../dm:libdm",
"../utils:libwmutil",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/dm:libdm",
"//foundation/window/window_manager/utils:libwmutil",
]
external_deps = [

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/wm"
group("unittest") {
@ -217,5 +217,8 @@ ohos_static_library("wm_unittest_common") {
"ipc:ipc_single",
"power_manager:powermgr_client",
]
part_name = "window_manager"
subsystem_name = "window"
}
## Build wm_unittest_common.a }}}

View File

@ -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("libwms_config") {
visibility = [ ":*" ]
@ -23,12 +23,12 @@ config("libwms_config") {
"include/window_snapshot",
"include/window_group",
"//utils/system/safwk/native/include",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/utils/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/dmserver/include",
"../interfaces/innerkits/wm",
"../interfaces/innerkits/dm",
"../wm/include",
"../utils/include",
"../dm/include",
"../dmserver/include",
]
}
@ -82,15 +82,15 @@ ohos_shared_library("libwms") {
configs = [
":libwms_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"../resources/config/build:coverage_flags",
]
deps = [
"../dmserver:libdms",
"../etc:wms_etc",
"../utils:libwmutil",
"../wm:libwm",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/etc:wms_etc",
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
"//third_party/libxml2:libxml2",
]

View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/window/window_manager/windowmanager_aafwk.gni")
import("../../../windowmanager_aafwk.gni")
module_out_path = "window_manager/wmserver"
group("unittest") {
@ -82,22 +82,22 @@ test_inner_deps = [
"${window_base_path}/dm:libdm_static",
"${window_base_path}/utils:libwmutil_static",
"${window_base_path}/wm:libwm_static",
"../..:libwms",
"../../../dmserver:libdms",
"../../../test/common/utils:libtestutil",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/window/window_manager/dmserver:libdms",
"//foundation/window/window_manager/test/common/utils:libtestutil",
"//foundation/window/window_manager/wmserver:libwms",
]
config("wmserver_unittest_common_public_config") {
include_dirs = [
"//foundation/window/window_manager/test/common/mock",
"//foundation/window/window_manager/test/common/utils/include",
"//foundation/window/window_manager/wm/include",
"//foundation/window/window_manager/wmserver/include",
"//foundation/window/window_manager/wmserver/include/zidl",
"//foundation/window/window_manager/wmserver/include/window_snapshot",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"../../../test/common/mock",
"../../../test/common/utils/include",
"../../../wm/include",
"../../include",
"../../include/zidl",
"../../include/window_snapshot",
"../../../interfaces/innerkits/wm",
"../../../utils/include",
"//third_party/googletest/googlemock/include",
"foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/",
]
@ -105,8 +105,8 @@ config("wmserver_unittest_common_public_config") {
test_public_config = [
":wmserver_unittest_common_public_config",
"//foundation/window/window_manager/resources/config/build:coverage_flags",
"//foundation/window/window_manager/resources/config/build:testcase_flags",
"../../../resources/config/build:coverage_flags",
"../../../resources/config/build:testcase_flags",
]
ohos_unittest("wmserver_window_manager_service_test") {