From 920f66e0a34cde86d149f06d7cdd0e42e71f9353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Tue, 28 May 2024 06:51:22 +0000 Subject: [PATCH 1/9] update camera/sequenceable/buffer_handle/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/buffer_handle/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/sequenceable/buffer_handle/BUILD.gn b/camera/sequenceable/buffer_handle/BUILD.gn index 429fd18b..1492374a 100644 --- a/camera/sequenceable/buffer_handle/BUILD.gn +++ b/camera/sequenceable/buffer_handle/BUILD.gn @@ -24,7 +24,7 @@ config("buffer_handle_sequenceable_config") { ohos_shared_library("libbuffer_handle_sequenceable_1.0") { sources = [ "buffer_handle_sequenceable.cpp" ] - all_dependent_configs = [ ":buffer_handle_sequenceable_config" ] + # all_dependent_configs = [ ":buffer_handle_sequenceable_config" ] external_deps = [ "c_utils:utils", -- Gitee From 5929637d603687b07cf0f357f1b6b717cbab105d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Tue, 28 May 2024 06:51:42 +0000 Subject: [PATCH 2/9] update camera/sequenceable/buffer_producer/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/buffer_producer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/sequenceable/buffer_producer/BUILD.gn b/camera/sequenceable/buffer_producer/BUILD.gn index d0e11bad..9798c108 100644 --- a/camera/sequenceable/buffer_producer/BUILD.gn +++ b/camera/sequenceable/buffer_producer/BUILD.gn @@ -25,7 +25,7 @@ config("camera_sequenceable_config") { ohos_shared_library("libbuffer_producer_sequenceable_1.0") { sources = [ "buffer_producer_sequenceable.cpp" ] - all_dependent_configs = [ ":camera_sequenceable_config" ] + # all_dependent_configs = [ ":camera_sequenceable_config" ] public_configs = [ ":camera_sequenceable_config" ] external_deps = [ -- Gitee From df65a92de90e8118b0071b884156470384675a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Tue, 28 May 2024 06:52:04 +0000 Subject: [PATCH 3/9] update camera/sequenceable/map_data/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/map_data/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/sequenceable/map_data/BUILD.gn b/camera/sequenceable/map_data/BUILD.gn index b066264e..6b06b5cf 100644 --- a/camera/sequenceable/map_data/BUILD.gn +++ b/camera/sequenceable/map_data/BUILD.gn @@ -24,7 +24,7 @@ config("map_data_sequenceable_config") { ohos_shared_library("libmap_data_sequenceable_1.0") { sources = [ "map_data_sequenceable.cpp" ] - all_dependent_configs = [ ":map_data_sequenceable_config" ] + # all_dependent_configs = [ ":map_data_sequenceable_config" ] public_configs = [ ":map_data_sequenceable_config" ] external_deps = [ -- Gitee From 955d92280579f48ef4fba2e1af85cf923b8e4d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Fri, 31 May 2024 02:26:01 +0000 Subject: [PATCH 4/9] update camera/sequenceable/buffer_handle/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/buffer_handle/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/camera/sequenceable/buffer_handle/BUILD.gn b/camera/sequenceable/buffer_handle/BUILD.gn index 1492374a..c53b2f22 100644 --- a/camera/sequenceable/buffer_handle/BUILD.gn +++ b/camera/sequenceable/buffer_handle/BUILD.gn @@ -24,8 +24,6 @@ config("buffer_handle_sequenceable_config") { ohos_shared_library("libbuffer_handle_sequenceable_1.0") { sources = [ "buffer_handle_sequenceable.cpp" ] - # all_dependent_configs = [ ":buffer_handle_sequenceable_config" ] - external_deps = [ "c_utils:utils", "hdf_core:libhdf_utils", -- Gitee From 2b2bd9df26cd647742cad94523ca0e818a8e95d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Fri, 31 May 2024 02:26:22 +0000 Subject: [PATCH 5/9] update camera/sequenceable/buffer_producer/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/buffer_producer/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/camera/sequenceable/buffer_producer/BUILD.gn b/camera/sequenceable/buffer_producer/BUILD.gn index 9798c108..b70c1455 100644 --- a/camera/sequenceable/buffer_producer/BUILD.gn +++ b/camera/sequenceable/buffer_producer/BUILD.gn @@ -25,7 +25,6 @@ config("camera_sequenceable_config") { ohos_shared_library("libbuffer_producer_sequenceable_1.0") { sources = [ "buffer_producer_sequenceable.cpp" ] - # all_dependent_configs = [ ":camera_sequenceable_config" ] public_configs = [ ":camera_sequenceable_config" ] external_deps = [ -- Gitee From 6d01f51ad9d01a501803e920661f44bbbc61190e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Fri, 31 May 2024 02:26:38 +0000 Subject: [PATCH 6/9] update camera/sequenceable/map_data/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/sequenceable/map_data/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/camera/sequenceable/map_data/BUILD.gn b/camera/sequenceable/map_data/BUILD.gn index 6b06b5cf..dd6a1071 100644 --- a/camera/sequenceable/map_data/BUILD.gn +++ b/camera/sequenceable/map_data/BUILD.gn @@ -24,7 +24,6 @@ config("map_data_sequenceable_config") { ohos_shared_library("libmap_data_sequenceable_1.0") { sources = [ "map_data_sequenceable.cpp" ] - # all_dependent_configs = [ ":map_data_sequenceable_config" ] public_configs = [ ":map_data_sequenceable_config" ] external_deps = [ -- Gitee From 34e3527b1e96bbba32beae5e9ef631a72117c2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Fri, 31 May 2024 03:40:24 +0000 Subject: [PATCH 7/9] update camera/metadata/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/metadata/BUILD.gn | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/camera/metadata/BUILD.gn b/camera/metadata/BUILD.gn index 1fafb04a..5cfeb55d 100644 --- a/camera/metadata/BUILD.gn +++ b/camera/metadata/BUILD.gn @@ -14,9 +14,9 @@ import("//build/ohos.gni") import("//drivers/interface/camera/camera.gni") -config("camera_metadata_config") { - include_dirs = [ "./include" ] -} +# config("camera_metadata_config") { +# include_dirs = [ "./include" ] +# } ohos_shared_library("metadata") { install_enable = true @@ -27,7 +27,9 @@ ohos_shared_library("metadata") { ] ldflags = [ "--coverage" ] cflags_cc = cflags - all_dependent_configs = [ ":camera_metadata_config" ] + include_dirs = [ "./include" ] + + # all_dependent_configs = [ ":camera_metadata_config" ] if (defined(ohos_lite)) { sources = [ "src/camera_metadata_info.cpp", -- Gitee From fd96dc24bc125bdbe2891a847917ae9878d59d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Fri, 31 May 2024 03:59:37 +0000 Subject: [PATCH 8/9] update camera/metadata/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/metadata/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/metadata/BUILD.gn b/camera/metadata/BUILD.gn index 5cfeb55d..bbb0e856 100644 --- a/camera/metadata/BUILD.gn +++ b/camera/metadata/BUILD.gn @@ -61,7 +61,7 @@ ohos_shared_library("metadata") { "chipsetsdk", "platformsdk_indirect", ] - public_configs = [ ":camera_metadata_config" ] + # public_configs = [ ":camera_metadata_config" ] part_name = "drivers_interface_camera" subsystem_name = "hdf" } -- Gitee From aa86d81bcf3f5bf68b5a90f60b1f7a4cc4e4394e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Fri, 31 May 2024 04:00:09 +0000 Subject: [PATCH 9/9] update camera/metadata/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/metadata/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/camera/metadata/BUILD.gn b/camera/metadata/BUILD.gn index bbb0e856..154d0b37 100644 --- a/camera/metadata/BUILD.gn +++ b/camera/metadata/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("metadata") { "chipsetsdk", "platformsdk_indirect", ] + # public_configs = [ ":camera_metadata_config" ] part_name = "drivers_interface_camera" subsystem_name = "hdf" -- Gitee