From a641c18f3c8adbb1a1b862b766f29cd14c180ad1 Mon Sep 17 00:00:00 2001 From: yangfan Date: Mon, 15 Apr 2024 11:00:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?NDK=E5=A4=B4=E6=96=87=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangfan --- multimedia/image_framework/BUILD.gn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/multimedia/image_framework/BUILD.gn b/multimedia/image_framework/BUILD.gn index 065fb108c..7aa7c366d 100644 --- a/multimedia/image_framework/BUILD.gn +++ b/multimedia/image_framework/BUILD.gn @@ -34,8 +34,8 @@ ohos_ndk_library("libpixelmap") { min_compact_version = "12" system_capability = "SystemCapability.Multimedia.Image.Core" system_capability_headers = [ - "multimedia/image_framework/pixelmap_native.h", - "multimedia/image_framework/image_common.h", + "multimedia/image_framework/image/pixelmap_native.h", + "multimedia/image_framework/image/image_common.h", ] } @@ -90,8 +90,8 @@ ohos_ndk_library("libimage_source") { min_compact_version = "12" system_capability = "SystemCapability.Multimedia.Image.ImageSource" system_capability_headers = [ - "multimedia/image_framework/image_source_native.h", - "multimedia/image_framework/image_common.h", + "multimedia/image_framework/image/image_source_native.h", + "multimedia/image_framework/image/image_common.h", ] } @@ -150,8 +150,8 @@ ohos_ndk_library("libimage_packer") { min_compact_version = "12" system_capability = "SystemCapability.Multimedia.Image.ImagePacker" system_capability_headers = [ - "multimedia/image_framework/image_packer_native.h", - "multimedia/image_framework/image_common.h", + "multimedia/image_framework/image/image_packer_native.h", + "multimedia/image_framework/image/image_common.h", ] } -- Gitee From 6c926e060b32eaaa756e0b0fcdfab84bc7a88a29 Mon Sep 17 00:00:00 2001 From: yangfan Date: Wed, 24 Apr 2024 14:31:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?dest=5Fdir=E4=B8=AD=E5=A2=9E=E5=8A=A0image?= =?UTF-8?q?=E5=AD=90=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangfan --- multimedia/image_framework/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/image_framework/BUILD.gn b/multimedia/image_framework/BUILD.gn index 7aa7c366d..1c48cc281 100644 --- a/multimedia/image_framework/BUILD.gn +++ b/multimedia/image_framework/BUILD.gn @@ -40,7 +40,7 @@ ohos_ndk_library("libpixelmap") { } ohos_ndk_headers("libpixelmap_header") { - dest_dir = "$ndk_headers_out_dir/multimedia/image_framework" + dest_dir = "$ndk_headers_out_dir/multimedia/image_framework/image" sources = [ "./include/image/image_common.h", "./include/image/pixelmap_native.h", @@ -96,7 +96,7 @@ ohos_ndk_library("libimage_source") { } ohos_ndk_headers("libimage_source_header") { - dest_dir = "$ndk_headers_out_dir/multimedia/image_framework" + dest_dir = "$ndk_headers_out_dir/multimedia/image_framework/image" sources = [ "./include/image/image_source_native.h" ] } @@ -156,6 +156,6 @@ ohos_ndk_library("libimage_packer") { } ohos_ndk_headers("libimage_packer_header") { - dest_dir = "$ndk_headers_out_dir/multimedia/image_framework" + dest_dir = "$ndk_headers_out_dir/multimedia/image_framework/image" sources = [ "./include/image/image_packer_native.h" ] } -- Gitee From 1e41b69eefde349a1e05e99ae89f56d417092920 Mon Sep 17 00:00:00 2001 From: yangfan Date: Wed, 24 Apr 2024 15:41:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangfan --- multimedia/image_framework/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/multimedia/image_framework/BUILD.gn b/multimedia/image_framework/BUILD.gn index 1c48cc281..6dde5b8f4 100644 --- a/multimedia/image_framework/BUILD.gn +++ b/multimedia/image_framework/BUILD.gn @@ -42,7 +42,6 @@ ohos_ndk_library("libpixelmap") { ohos_ndk_headers("libpixelmap_header") { dest_dir = "$ndk_headers_out_dir/multimedia/image_framework/image" sources = [ - "./include/image/image_common.h", "./include/image/pixelmap_native.h", ] } -- Gitee From e62e3e2fa938dec1487fd169947dce70b7008c7a Mon Sep 17 00:00:00 2001 From: yangfan Date: Wed, 24 Apr 2024 16:22:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangfan --- multimedia/image_framework/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/multimedia/image_framework/BUILD.gn b/multimedia/image_framework/BUILD.gn index 6dde5b8f4..be2610e97 100644 --- a/multimedia/image_framework/BUILD.gn +++ b/multimedia/image_framework/BUILD.gn @@ -41,9 +41,7 @@ ohos_ndk_library("libpixelmap") { ohos_ndk_headers("libpixelmap_header") { dest_dir = "$ndk_headers_out_dir/multimedia/image_framework/image" - sources = [ - "./include/image/pixelmap_native.h", - ] + sources = [ "./include/image/pixelmap_native.h" ] } ohos_ndk_library("libimage_ndk") { -- Gitee