From 20694f9c6a158adc204c662eecc7854d000e11d4 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 21 Aug 2025 10:39:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E6=8C=81composer=E5=8D=87?= =?UTF-8?q?=E7=BA=A7V1=5F3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- display/buffer/test/benchmarktest/BUILD.gn | 2 +- .../test/benchmarktest/display_buffer_benchmark_test.cpp | 2 +- display/buffer/test/fuzztest/mapper_fuzzer/BUILD.gn | 2 +- display/buffer/test/fuzztest/metadata_fuzzer/BUILD.gn | 2 +- display/buffer/test/moduletest/BUILD.gn | 2 +- display/buffer/test/unittest/BUILD.gn | 4 ++-- display/buffer/test/unittest/death_test.cpp | 2 +- display/buffer/test/unittest/display_buffer_ut.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/display/buffer/test/benchmarktest/BUILD.gn b/display/buffer/test/benchmarktest/BUILD.gn index eef483ab56..dc45583f0f 100644 --- a/display/buffer/test/benchmarktest/BUILD.gn +++ b/display/buffer/test/benchmarktest/BUILD.gn @@ -41,7 +41,7 @@ ohos_benchmarktest("hdf_display_buffer_benchmarktest") { "drivers_interface_display:libdisplay_buffer_proxy_1.1", "drivers_interface_display:libdisplay_buffer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_proxy_1.3", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "googletest:gtest", "hdf_core:libhdf_utils", diff --git a/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp b/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp index 0a086f3000..6ac9c55a65 100644 --- a/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp +++ b/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp @@ -22,7 +22,7 @@ #include "gtest/gtest.h" #include "hdf_base.h" #include "hdf_log.h" -#include "v1_2/display_composer_type.h" +#include "v1_3/display_composer_type.h" #include "v1_2/display_buffer_type.h" #include "v1_3/include/idisplay_buffer.h" using namespace OHOS::HDI::Display::Buffer; diff --git a/display/buffer/test/fuzztest/mapper_fuzzer/BUILD.gn b/display/buffer/test/fuzztest/mapper_fuzzer/BUILD.gn index ee0ab2a4d2..a0f7b2b295 100644 --- a/display/buffer/test/fuzztest/mapper_fuzzer/BUILD.gn +++ b/display/buffer/test/fuzztest/mapper_fuzzer/BUILD.gn @@ -27,7 +27,7 @@ ohos_fuzztest("MapperFuzzTest") { "drivers_interface_display:libdisplay_buffer_stub_1.0", "drivers_interface_display:libdisplay_buffer_stub_1.2", "drivers_interface_display:libdisplay_buffer_stub_1.3", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_stub_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_utils", diff --git a/display/buffer/test/fuzztest/metadata_fuzzer/BUILD.gn b/display/buffer/test/fuzztest/metadata_fuzzer/BUILD.gn index 989dbe3b50..bf9a929d4a 100644 --- a/display/buffer/test/fuzztest/metadata_fuzzer/BUILD.gn +++ b/display/buffer/test/fuzztest/metadata_fuzzer/BUILD.gn @@ -24,7 +24,7 @@ ohos_fuzztest("MetadataFuzzTest") { "c_utils:utils", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_1", "drivers_interface_display:libdisplay_buffer_stub_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_stub_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_utils", diff --git a/display/buffer/test/moduletest/BUILD.gn b/display/buffer/test/moduletest/BUILD.gn index 1c7b33c164..0d4305ddb3 100644 --- a/display/buffer/test/moduletest/BUILD.gn +++ b/display/buffer/test/moduletest/BUILD.gn @@ -27,7 +27,7 @@ ohos_moduletest("hdf_disp_buffer_moduletest") { "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_1", "drivers_interface_display:libdisplay_buffer_proxy_1.0", "drivers_interface_display:libdisplay_buffer_proxy_1.1", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "googletest:gtest", "graphic_surface:buffer_handle", diff --git a/display/buffer/test/unittest/BUILD.gn b/display/buffer/test/unittest/BUILD.gn index 72a59d7834..7404d6a799 100644 --- a/display/buffer/test/unittest/BUILD.gn +++ b/display/buffer/test/unittest/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("hdf_disp_buffer_unittest") { "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_3", "drivers_interface_display:libdisplay_buffer_proxy_1.0", "drivers_interface_display:libdisplay_buffer_proxy_1.1", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "googletest:gtest", "graphic_surface:buffer_handle", @@ -50,7 +50,7 @@ ohos_unittest("buffer_death_test") { "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_1", "drivers_interface_display:libdisplay_buffer_proxy_1.0", "drivers_interface_display:libdisplay_buffer_proxy_1.1", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "googletest:gtest", "graphic_surface:buffer_handle", diff --git a/display/buffer/test/unittest/death_test.cpp b/display/buffer/test/unittest/death_test.cpp index d7610e0362..a02efb3191 100644 --- a/display/buffer/test/unittest/death_test.cpp +++ b/display/buffer/test/unittest/death_test.cpp @@ -17,7 +17,7 @@ #include "hdf_base.h" #include "hdf_log.h" #include "gtest/gtest.h" -#include "v1_0/display_composer_type.h" +#include "v1_3/display_composer_type.h" namespace OHOS { namespace HDI { diff --git a/display/buffer/test/unittest/display_buffer_ut.cpp b/display/buffer/test/unittest/display_buffer_ut.cpp index c7a1471bfe..6b9d0f1076 100644 --- a/display/buffer/test/unittest/display_buffer_ut.cpp +++ b/display/buffer/test/unittest/display_buffer_ut.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" #include "v1_2/display_buffer_type.h" -#include "v1_2/display_composer_type.h" +#include "v1_3/display_composer_type.h" #include "hdf_base.h" #include "hdf_log.h" -- Gitee From c08ab3b1880e9c12d82bf93e67dc5da0d5242988 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 21 Aug 2025 10:42:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E6=8C=81composer=E5=8D=87?= =?UTF-8?q?=E7=BA=A7V1=5F3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- .../buffer/test/benchmarktest/display_buffer_benchmark_test.cpp | 2 +- display/buffer/test/unittest/death_test.cpp | 2 +- display/buffer/test/unittest/display_buffer_ut.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp b/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp index 6ac9c55a65..0a086f3000 100644 --- a/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp +++ b/display/buffer/test/benchmarktest/display_buffer_benchmark_test.cpp @@ -22,7 +22,7 @@ #include "gtest/gtest.h" #include "hdf_base.h" #include "hdf_log.h" -#include "v1_3/display_composer_type.h" +#include "v1_2/display_composer_type.h" #include "v1_2/display_buffer_type.h" #include "v1_3/include/idisplay_buffer.h" using namespace OHOS::HDI::Display::Buffer; diff --git a/display/buffer/test/unittest/death_test.cpp b/display/buffer/test/unittest/death_test.cpp index a02efb3191..d7610e0362 100644 --- a/display/buffer/test/unittest/death_test.cpp +++ b/display/buffer/test/unittest/death_test.cpp @@ -17,7 +17,7 @@ #include "hdf_base.h" #include "hdf_log.h" #include "gtest/gtest.h" -#include "v1_3/display_composer_type.h" +#include "v1_0/display_composer_type.h" namespace OHOS { namespace HDI { diff --git a/display/buffer/test/unittest/display_buffer_ut.cpp b/display/buffer/test/unittest/display_buffer_ut.cpp index 6b9d0f1076..c7a1471bfe 100644 --- a/display/buffer/test/unittest/display_buffer_ut.cpp +++ b/display/buffer/test/unittest/display_buffer_ut.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" #include "v1_2/display_buffer_type.h" -#include "v1_3/display_composer_type.h" +#include "v1_2/display_composer_type.h" #include "hdf_base.h" #include "hdf_log.h" -- Gitee