diff --git a/distributedscreen.gni b/distributedscreen.gni index c296f4c..b17f27a 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -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" diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 29eac18..b984950 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -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", ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index 4be676f..5bedfec 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -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", ] diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index b079cf1..3927266 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -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", ] diff --git a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn index 115d0e5..0b37ed8 100644 --- a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 68dab59..b327c96 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -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 = [ diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 99bed63..6849e2e 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -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", ] diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 6da772f..7421c70 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -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", ] diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 4afcdbc..44d8fcd 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -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", ] diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index b5860b9..7bd0d85 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -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", ] diff --git a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn index 919d8dc..3e2f845 100644 --- a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn index 230759f..d034995 100644 --- a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn index b4334b0..d143637 100644 --- a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn index 2416f88..3682283 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn index 074ffc9..60deaaa 100644 --- a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 13822b9..afefd63 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -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", diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index b5bb758..1bc5283 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -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", diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 39fdb36..3f4533a 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -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", diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index ce81a19..15c0bae 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -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", diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index e681ecd..d81290e 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -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", diff --git a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index f90f883..b8f1cc8 100644 --- a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -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", ] diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 5cf5153..2ef72f3 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -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",