From 9bf595398bcb9e57fa1ba0f3cc8b1a93ed1ec572 Mon Sep 17 00:00:00 2001 From: mengkun Date: Sun, 8 May 2022 12:14:35 +0800 Subject: [PATCH] change graphic/standard to graphic/graphic Signed-off-by: mengkun Change-Id: I9444098e12cffd04e2ab499a4a2ec34ff17441df --- distributedscreen.gni | 7 ++++--- screenhandler/BUILD.gn | 2 +- .../fuzztest/dscreenhandler_fuzzer/BUILD.gn | 2 +- services/screenclient/BUILD.gn | 2 +- services/screenservice/sinkservice/BUILD.gn | 4 ++-- services/screenservice/sourceservice/BUILD.gn | 6 +++--- .../screentransport/screensinktrans/BUILD.gn | 4 ++-- .../screensourcetrans/BUILD.gn | 4 ++-- .../screendatachannel_fuzzer/BUILD.gn | 4 ++-- .../screensinkprocessor_fuzzer/BUILD.gn | 4 ++-- .../fuzztest/screensinktrans_fuzzer/BUILD.gn | 4 ++-- .../screensourceprocessor_fuzzer/BUILD.gn | 4 ++-- .../screensourcetrans_fuzzer/BUILD.gn | 6 +++--- .../test/unittest/screendatachannel/BUILD.gn | 16 +++++++++------- .../unittest/screensinkprocessor/BUILD.gn | 17 +++++++++-------- .../test/unittest/screensinktrans/BUILD.gn | 19 +++++++++---------- .../unittest/screensourceprocessor/BUILD.gn | 13 +++++++------ .../test/unittest/screensourcetrans/BUILD.gn | 11 ++++++----- .../fuzztest/softbusadapter_fuzzer/BUILD.gn | 4 ++-- .../softbusadapter/test/unittest/BUILD.gn | 11 ++++++----- 20 files changed, 75 insertions(+), 69 deletions(-) diff --git a/distributedscreen.gni b/distributedscreen.gni index 217b56cf..c296f4cf 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -12,14 +12,15 @@ # limitations under the License. distributedscreen_path = "//foundation/distributedhardware/distributedscreen" -distributedhardwarefwk_path = "//foundation/distributedhardware/distributedhardwarefwk" +distributedhardwarefwk_path = + "//foundation/distributedhardware/distributedhardwarefwk" windowmanager_path = "//foundation/windowmanager" mediastandard_path = "//foundation/multimedia/media_standard" -graphicstandard_path = "//foundation/graphic/standard" +graphicstandard_path = "//foundation/graphic/graphic" common_path = "${distributedscreen_path}/common" services_path = "${distributedscreen_path}/services" interfaces_path = "${distributedscreen_path}/interfaces" fwk_utils_path = "${distributedhardwarefwk_path}/utils" fwk_common_path = "${distributedhardwarefwk_path}/common" fwk_services_path = "${distributedhardwarefwk_path}/services" -build_flags = ["-Werror"] \ No newline at end of file +build_flags = [ "-Werror" ] diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 727296f6..b079cf10 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/standard/rosen/modules/render_service_client:librender_service_client", + "//foundation/graphic/graphic/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 c003bc19..115d0e5a 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/standard/rosen/modules/render_service_client:librender_service_client", + "//foundation/graphic/graphic/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 cd000bdd..ab4e73c2 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/standard/rosen/modules/render_service_client:librender_service_client", + "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client", ] defines = [ diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 1b85c0e0..99bed633 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 922c9844..a821fa96 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", - "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", + "//foundation/graphic/graphic/frameworks/surface:surface", + "//foundation/graphic/graphic/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 e0a631f4..7f22e34f 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index a8e5ae18..fa3f89a7 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/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 7895eec6..919d8dcb 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/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 4648931c..230759f9 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/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 97ed2768..b4334b0f 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/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 979a7ea0..2416f88e 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/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 bee0caa7..074ffc94 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/rosen/modules/render_service_base/include", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/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 da29a56d..13822b95 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/data_channel_test" @@ -20,7 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", ] @@ -50,11 +51,11 @@ ohos_unittest("DataChannelTest") { configs = [ ":module_private_config" ] deps = [ + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", "//utils/native/base:utils", ] @@ -70,8 +71,9 @@ ohos_unittest("DataChannelTest") { "LOG_DOMAIN=0xD004100", ] - cflags = [ "-frtti", - "-fexceptions" + cflags = [ + "-frtti", + "-fexceptions", ] cflags_cc = cflags } diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index c61f8fb0..b5bb758f 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -11,10 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/test.gni") import("//build/ohos.gni") import("//build/ohos_var.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import("//build/test.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/sink_processor_test" @@ -22,7 +23,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", ] @@ -49,17 +50,17 @@ ohos_unittest("SinkProcessorTest") { sources = [ "${services_path}/screentransport/test/unittest/screensinkprocessor/src/image_sink_decoder_test.cpp", - "${services_path}/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp" + "${services_path}/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp", ] configs = [ ":module_private_config" ] deps = [ + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", "//utils/native/base:utils", ] @@ -83,4 +84,4 @@ ohos_unittest("SinkProcessorTest") { group("sink_processor_test") { testonly = true deps = [ ":SinkProcessorTest" ] -} \ No newline at end of file +} diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 90ecbf79..39fdb36b 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -11,10 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/test.gni") import("//build/ohos.gni") import("//build/ohos_var.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import("//build/test.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/sink_trans_test" @@ -22,7 +23,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", ] @@ -46,18 +47,16 @@ config("module_private_config") { ohos_unittest("SinkTransTest") { module_out_path = module_out_path - sources = [ - "${services_path}/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp" - ] + sources = [ "${services_path}/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp" ] configs = [ ":module_private_config" ] deps = [ + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", "//utils/native/base:utils", ] @@ -81,4 +80,4 @@ ohos_unittest("SinkTransTest") { group("sink_trans_test") { testonly = true deps = [ ":SinkTransTest" ] -} \ No newline at end of file +} diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 2f935349..ce81a19b 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/source_processor_test" @@ -20,7 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -47,18 +48,18 @@ ohos_unittest("SourceProcessorTest") { module_out_path = module_out_path sources = [ - "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_processor_test.cpp", "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_encoder_test.cpp", + "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_processor_test.cpp", ] configs = [ ":module_private_config" ] deps = [ + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 09c1d986..e681ecd3 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" @@ -20,7 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", @@ -54,11 +55,11 @@ ohos_unittest("SourceTransTest") { configs = [ ":module_private_config" ] deps = [ + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", "//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 016636e8..f90f883a 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/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/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/standard/frameworks/surface:surface", + "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 53959db3..5cf51530 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") module_out_path = "distributed_screen/soft_bus_adapter_test" @@ -20,7 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", + "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -49,11 +50,11 @@ ohos_unittest("SoftBusAdapterTest") { configs = [ ":module_private_config" ] deps = [ + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", + "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/graphic/standard/frameworks/surface:surface", "//utils/native/base:utils", ] -- Gitee