Description:change dir graphic/graphic to graphic/graphic_2d

IssueNo:https://gitee.com/openharmony/graphic_standard/issues/I57W1P
Feature or Bugfix: Bugfix
Binary Source:NA

Signed-off-by: sufeng <sufeng6@huawei.com>
This commit is contained in:
sufeng
2022-05-17 18:19:24 +08:00
parent 595ac40371
commit 2c5252bfe7
22 changed files with 40 additions and 40 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ distributedhardwarefwk_path =
"//foundation/distributedhardware/distributedhardwarefwk"
windowmanager_path = "//foundation/windowmanager"
mediastandard_path = "//foundation/multimedia/media_standard"
graphicstandard_path = "//foundation/graphic/graphic"
graphicstandard_path = "//foundation/graphic/graphic_2d"
common_path = "${distributedscreen_path}/common"
services_path = "${distributedscreen_path}/services"
interfaces_path = "${distributedscreen_path}/interfaces"
@@ -21,7 +21,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include",
]
@@ -21,7 +21,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include",
]
+1 -1
View File
@@ -36,7 +36,7 @@ ohos_shared_library("distributed_screen_handler") {
"${mediastandard_path}/interfaces/inner_api/native:media_client",
"${windowmanager_path}/dm:libdm",
"//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",
"//utils/native/base:utils",
]
@@ -54,7 +54,7 @@ ohos_fuzztest("DscreenHandlerFuzzTest") {
"${mediastandard_path}/interfaces/inner_api/native:media_client",
"${windowmanager_path}/dm:libdm",
"//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",
"//utils/native/base:utils",
]
+1 -1
View File
@@ -40,7 +40,7 @@ ohos_shared_library("distributed_screen_client") {
"${graphicstandard_path}/frameworks/surface:surface",
"${windowmanager_path}/wm:libwm",
"//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",
]
defines = [
+2 -2
View File
@@ -21,7 +21,7 @@ ohos_shared_library("distributed_screen_sink") {
"//third_party/json/include",
"//utils/native/base/include",
"//utils/system/safwk/native/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${windowmanager_path}/interfaces/innerkits/dm",
"${fwk_common_path}/utils/include",
]
@@ -59,7 +59,7 @@ ohos_shared_library("distributed_screen_sink") {
"${services_path}/screenclient:distributed_screen_client",
"${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
"${windowmanager_path}/dm:libdm",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -22,7 +22,7 @@ ohos_shared_library("distributed_screen_source") {
"${windowmanager_path}/interfaces/innerkits/dm",
"//utils/native/base/include",
"//utils/system/safwk/native/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${mediastandard_path}/interfaces/inner_api/native",
]
@@ -62,8 +62,8 @@ ohos_shared_library("distributed_screen_source") {
"${mediastandard_path}/interfaces/inner_api/native:media_client",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"${windowmanager_path}/dm:libdm",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//utils/native/base:utils",
]
@@ -19,7 +19,7 @@ import(
ohos_shared_library("distributed_screen_sinktrans") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -49,7 +49,7 @@ ohos_shared_library("distributed_screen_sinktrans") {
deps = [
"${common_path}:distributed_screen_utils",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -19,7 +19,7 @@ import(
ohos_shared_library("distributed_screen_sourcetrans") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -48,7 +48,7 @@ ohos_shared_library("distributed_screen_sourcetrans") {
deps = [
"${common_path}:distributed_screen_utils",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenDataChannelFuzzTest") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -59,7 +59,7 @@ ohos_fuzztest("ScreenDataChannelFuzzTest") {
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -25,7 +25,7 @@ ohos_fuzztest("ScreenSinkProcessorFuzzTest") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -57,7 +57,7 @@ ohos_fuzztest("ScreenSinkProcessorFuzzTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenSinkTransFuzzTest") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -59,7 +59,7 @@ ohos_fuzztest("ScreenSinkTransFuzzTest") {
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screenservice/sinkservice:distributed_screen_sink",
"${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -25,7 +25,7 @@ ohos_fuzztest("ScreenSourceProcessorFuzzTest") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/",
]
@@ -58,7 +58,7 @@ ohos_fuzztest("ScreenSourceProcessorFuzzTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${windowmanager_path}/interfaces/innerkits/dm",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
@@ -50,7 +50,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
"${services_path}/screentransport/screensourceprocessor/encoder/include",
"${services_path}/softbusadapter/include",
"${services_path}/screenservice/sourceservice/dscreenmgr/include",
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"${interfaces_path}/innerkits/native_cpp/screen_sink/include",
"${interfaces_path}/innerkits/native_cpp/screen_source/include/callback",
]
@@ -70,7 +70,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
"${services_path}/screenservice/sourceservice:distributed_screen_source",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"${windowmanager_path}/dm:libdm",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -21,7 +21,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -53,7 +53,7 @@ ohos_unittest("DataChannelTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
@@ -23,7 +23,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -58,7 +58,7 @@ ohos_unittest("SinkProcessorTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
@@ -23,7 +23,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
]
@@ -54,7 +54,7 @@ ohos_unittest("SinkTransTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
@@ -21,7 +21,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/",
]
@@ -57,7 +57,7 @@ ohos_unittest("SourceProcessorTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
@@ -21,7 +21,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/log/include",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/",
@@ -57,7 +57,7 @@ ohos_unittest("SourceTransTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
@@ -26,7 +26,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") {
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/",
]
@@ -57,7 +57,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//utils/native/base:utils",
]
@@ -21,7 +21,7 @@ config("module_private_config") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/json/include",
"//foundation/graphic/graphic/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"${fwk_common_path}/utils/include",
"${fwk_utils_path}/include/",
]
@@ -52,7 +52,7 @@ ohos_unittest("SoftBusAdapterTest") {
deps = [
"${fwk_utils_path}:distributedhardwareutils",
"${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",