openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-20 20:20:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

!872 change dir graphic/graphic to graphic/graphic_2d

Browse Source 
Merge pull request !872 from 苏锋/master
This commit is contained in:
openharmony_ci
2022-05-25 07:10:54 +00:00
committed by Gitee
parent 84c45286a0 2db5c948f6
commit 892be32617
21 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dm/BUILD.gn
+2 -2
View File
@@ -45,8 +45,8 @@ ohos_shared_library("libdm") {
public_configs = [ ":libdm_public_config" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//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/windowmanager/utils:libwmutil",
]
dm/test/fuzztest/displaymanager_fuzzer/BUILD.gn
+2 -2
View File
@@ -24,7 +24,7 @@ ohos_fuzztest("DisplayManagerFuzzTest") {
include_dirs = [
"//foundation/windowmanager/interfaces/innerkits/dm",
"//utils/native/base/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
cflags = [
"-g",
@@ -34,7 +34,7 @@ ohos_fuzztest("DisplayManagerFuzzTest") {
]
sources = [ "displaymanager_fuzzer.cpp" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//utils/native/base:utils",
]
dm/test/fuzztest/displaymanageripc_fuzzer/BUILD.gn
+1 -1
View File
@@ -34,7 +34,7 @@ ohos_fuzztest("DisplayManagerIPCFuzzTest") {
]
sources = [ "displaymanageripc_fuzzer.cpp" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
]
external_deps = [ "samgr_standard:samgr_proxy" ]
dm/test/fuzztest/screen_fuzzer/BUILD.gn
+2 -2
View File
@@ -23,7 +23,7 @@ ohos_fuzztest("ScreenFuzzTest") {
include_dirs = [
"//foundation/windowmanager/interfaces/innerkits/dm",
"//utils/native/base/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
cflags = [
"-g",
@@ -33,7 +33,7 @@ ohos_fuzztest("ScreenFuzzTest") {
]
sources = [ "screen_fuzzer.cpp" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//utils/native/base:utils",
]
dm/test/fuzztest/screenmanager_fuzzer/BUILD.gn
+2 -2
View File
@@ -24,7 +24,7 @@ ohos_fuzztest("ScreenManagerFuzzTest") {
include_dirs = [
"//foundation/windowmanager/interfaces/innerkits/dm",
"//utils/native/base/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
cflags = [
"-g",
@@ -34,7 +34,7 @@ ohos_fuzztest("ScreenManagerFuzzTest") {
]
sources = [ "screenmanager_fuzzer.cpp" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//utils/native/base:utils",
]
dm/test/systemtest/BUILD.gn
+3 -3
View File
@@ -119,8 +119,8 @@ config("dm_systemtest_common_public_config") {
"//foundation/windowmanager/utils/include",
# RSSurface
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic/rosen/modules/render_service_client",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
]
}
@@ -133,7 +133,7 @@ ohos_static_library("dm_systemtest_common") {
public_configs = [ ":dm_systemtest_common_public_config" ]
public_deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/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
+2 -2
View File
@@ -111,7 +111,7 @@ config("dm_unittest_common_public_config") {
"//foundation/windowmanager/snapshot",
"//foundation/windowmanager/interfaces/innerkits/dm",
"//foundation/windowmanager/utils/include",
"//foundation/graphic/graphic/rosen/modules/render_service_client", # RSSurface
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client", # RSSurface
]
}
@@ -122,7 +122,7 @@ ohos_static_library("dm_unittest_common") {
public_configs = [ ":dm_unittest_common_public_config" ]
public_deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/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
+1 -1
View File
@@ -65,7 +65,7 @@ ohos_shared_library("libdms") {
"//foundation/windowmanager/utils:libwmutil",
# RSSurface
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
external_deps = [
extension/extension_connection/BUILD.gn
+1 -1
View File
@@ -41,7 +41,7 @@ ohos_shared_library("libwindow_extension_client") {
configs = [ ":libwindow_extension_client_private_config" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/extension/window_extension:libwindow_extension",
"//foundation/windowmanager/wm:libwm",
]
extension/window_extension/BUILD.gn
+1 -1
View File
@@ -44,7 +44,7 @@ ohos_shared_library("libwindow_extension") {
deps = [
"//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/interfaces/kits/napi/window_runtime:window_native_kit",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
interfaces/innerkits/BUILD.gn
+1 -1
View File
@@ -25,7 +25,7 @@ ohos_shared_library("wm_interface") {
public_deps = [
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//utils/native/base:utils",
interfaces/kits/napi/display_runtime/BUILD.gn
+1 -1
View File
@@ -40,7 +40,7 @@ ohos_shared_library("display_napi") {
"${aakits_path}/appkit:app_context",
"${aakits_path}/appkit:appkit_native",
"../common:wm_napi_common",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
]
interfaces/kits/napi/screen_runtime/BUILD.gn
+1 -1
View File
@@ -41,7 +41,7 @@ ohos_shared_library("screen_napi") {
"${aakits_path}/ability/native:abilitykit_native",
"${aakits_path}/appkit:app_context",
"${aakits_path}/appkit:appkit_native",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
"//foundation/windowmanager/utils:libwmutil",
snapshot/BUILD.gn
+1 -1
View File
@@ -53,7 +53,7 @@ ohos_executable("snapshot_virtual_screen") {
configs = [ ":snapshot_config" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
utils/BUILD.gn
+3 -3
View File
@@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
config("libwmutil_private_config") {
include_dirs = [
"include",
@@ -51,8 +51,8 @@ ohos_shared_library("libwmutil") {
public_configs = [ ":libwmutil_public_config" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//third_party/flutter/build/skia:ace_skia_ohos",
]
wm/BUILD.gn
+2 -2
View File
@@ -63,12 +63,12 @@ ohos_shared_library("libwm") {
public_configs = [ ":libwm_public_config" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
# vsync
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
]
external_deps = [
wm/test/fuzztest/windowipc_fuzzer/BUILD.gn
+1 -1
View File
@@ -35,7 +35,7 @@ ohos_fuzztest("WindowIPCFuzzTest") {
]
sources = [ "windowipc_fuzzer.cpp" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
]
external_deps = [ "samgr_standard:samgr_proxy" ]
wm/test/fuzztest/windowscene_fuzzer/BUILD.gn
+2 -2
View File
@@ -25,7 +25,7 @@ ohos_fuzztest("WindowSceneFuzzTest") {
"//foundation/windowmanager/wmserver/include",
"//foundation/windowmanager/interfaces/innerkits/dm",
"//foundation/windowmanager/interfaces/innerkits/wm",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//utils/native/base/include",
]
cflags = [
@@ -36,7 +36,7 @@ ohos_fuzztest("WindowSceneFuzzTest") {
]
sources = [ "windowscene_fuzzer.cpp" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
wm/test/systemtest/BUILD.gn
+1 -1
View File
@@ -256,7 +256,7 @@ ohos_static_library("wm_systemtest_common") {
# need delete it for abilitycontext
"${aainnerkits_path}/ability_manager:ability_manager",
"//foundation/arkui/napi:ace_napi",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
wm/test/unittest/BUILD.gn
+1 -1
View File
@@ -179,7 +179,7 @@ ohos_static_library("wm_unittest_common") {
"//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent",
"//foundation/arkui/napi:ace_napi",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/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
+2 -2
View File
@@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build libwms.so
config("libwms_config") {
@@ -103,7 +103,7 @@ ohos_shared_library("libwms") {
":window_divider_image",
":window_manager_config",
":window_starting_image",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
"//foundation/windowmanager/utils:libwmutil",