From c058787af94aef28c6fe2c40b788a6dd4ac66510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8A=E5=AE=98=E6=99=AF=E5=A8=81?= Date: Thu, 31 Jul 2025 12:13:48 +0800 Subject: [PATCH 1/2] 111 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 上官景威 --- .../innerkitsimpl/pixelconverter/BUILD.gn | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn index f1181a4d8..0770e5026 100644 --- a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn +++ b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn @@ -27,44 +27,17 @@ config("pixelconvertadapter_public_config") { "//foundation/multimedia/image_framework/mock/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/ipc/utils/include", - "$third_party_skia_root/include/core", - "$third_party_skia_root/include/encode", - "$third_party_skia_root", - "$third_party_skia_root/src/ports/skia_ohos", - "$third_party_skia_root/src/ports", - "$third_party_skia_root/src/images", - "$third_party_skia_root/src/ports/skia_ohos", - "$third_party_skia_root/third_party/externals/freetype/include/freetype", - "//third_party/bounds_checking_function/include", ] } else if (use_clang_mac) { include_dirs += [ "//foundation/multimedia/image_framework/mock/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$third_party_skia_root/include/core", - "$third_party_skia_root/include/encode", - "$third_party_skia_root", - "$third_party_skia_root/src/ports/skia_ohos", - "$third_party_skia_root/src/ports", - "$third_party_skia_root/src/images", - "$third_party_skia_root/src/ports/skia_ohos", - "$third_party_skia_root/third_party/externals/freetype/include/freetype", - "//third_party/bounds_checking_function/include", ] } else if (use_clang_ios) { include_dirs += [ "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/utils/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$third_party_skia_root/include/core", - "$third_party_skia_root/include/encode", - "$third_party_skia_root", - "$third_party_skia_root/src/ports/skia_ohos", - "$third_party_skia_root/src/ports", - "$third_party_skia_root/src/images", - "$third_party_skia_root/include/private", - "$third_party_skia_root/third_party/externals/freetype/include/freetype", - "//third_party/bounds_checking_function/include", "$image_subsystem/mock/native/include/log", ] } else if (use_clang_android) { @@ -72,14 +45,6 @@ config("pixelconvertadapter_public_config") { "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/utils/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$third_party_skia_root/include/encode", - "$third_party_skia_root", - "$third_party_skia_root/src/ports/skia_ohos", - "$third_party_skia_root/src/ports", - "$third_party_skia_root/src/images", - "$third_party_skia_root/include/private", - "$third_party_skia_root/third_party/externals/freetype/include/freetype", - "//third_party/bounds_checking_function/include", "$image_subsystem/mock/native/include/log", ] } @@ -96,7 +61,6 @@ if (use_clang_ios) { "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" @@ -123,14 +87,12 @@ if (use_clang_ios) { "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform } else if (use_clang_android) { deps = [ "../utils:image_utils", @@ -175,7 +137,7 @@ ohos_static_library("pixelconvertadapter_static") { } if (is_arkui_x) { - include_dirs = [ "//third_party/ffmpeg" ] + include_dirs = [ "//third_party/ffmpeg" ]. } if (use_mingw_win) { @@ -184,14 +146,12 @@ ohos_static_library("pixelconvertadapter_static") { "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform } else if (use_clang_ios) { defines = image_decode_ios_defines deps = [ @@ -199,14 +159,12 @@ ohos_static_library("pixelconvertadapter_static") { "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform } else if (use_clang_android) { deps = [ "../utils:image_utils_static", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] - deps += skia_platform libs = [ "nativewindow" ] } else { -- Gitee From 20c3542ecd7444bf6e97fe2c3b866c3e690e30ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8A=E5=AE=98=E6=99=AF=E5=A8=81?= Date: Thu, 31 Jul 2025 14:24:54 +0800 Subject: [PATCH 2/2] fix GN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 上官景威 --- .../innerkitsimpl/pixelconverter/BUILD.gn | 44 ++++++++++++++++++- .../common/libs/image/libextplugin/BUILD.gn | 8 ---- .../common/libs/image/libjpegplugin/BUILD.gn | 26 +++++------ 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn index 0770e5026..f1181a4d8 100644 --- a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn +++ b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn @@ -27,17 +27,44 @@ config("pixelconvertadapter_public_config") { "//foundation/multimedia/image_framework/mock/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/ipc/utils/include", + "$third_party_skia_root/include/core", + "$third_party_skia_root/include/encode", + "$third_party_skia_root", + "$third_party_skia_root/src/ports/skia_ohos", + "$third_party_skia_root/src/ports", + "$third_party_skia_root/src/images", + "$third_party_skia_root/src/ports/skia_ohos", + "$third_party_skia_root/third_party/externals/freetype/include/freetype", + "//third_party/bounds_checking_function/include", ] } else if (use_clang_mac) { include_dirs += [ "//foundation/multimedia/image_framework/mock/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$third_party_skia_root/include/core", + "$third_party_skia_root/include/encode", + "$third_party_skia_root", + "$third_party_skia_root/src/ports/skia_ohos", + "$third_party_skia_root/src/ports", + "$third_party_skia_root/src/images", + "$third_party_skia_root/src/ports/skia_ohos", + "$third_party_skia_root/third_party/externals/freetype/include/freetype", + "//third_party/bounds_checking_function/include", ] } else if (use_clang_ios) { include_dirs += [ "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/utils/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$third_party_skia_root/include/core", + "$third_party_skia_root/include/encode", + "$third_party_skia_root", + "$third_party_skia_root/src/ports/skia_ohos", + "$third_party_skia_root/src/ports", + "$third_party_skia_root/src/images", + "$third_party_skia_root/include/private", + "$third_party_skia_root/third_party/externals/freetype/include/freetype", + "//third_party/bounds_checking_function/include", "$image_subsystem/mock/native/include/log", ] } else if (use_clang_android) { @@ -45,6 +72,14 @@ config("pixelconvertadapter_public_config") { "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/utils/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "$third_party_skia_root/include/encode", + "$third_party_skia_root", + "$third_party_skia_root/src/ports/skia_ohos", + "$third_party_skia_root/src/ports", + "$third_party_skia_root/src/images", + "$third_party_skia_root/include/private", + "$third_party_skia_root/third_party/externals/freetype/include/freetype", + "//third_party/bounds_checking_function/include", "$image_subsystem/mock/native/include/log", ] } @@ -61,6 +96,7 @@ if (use_clang_ios) { "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" @@ -87,12 +123,14 @@ if (use_clang_ios) { "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform } else if (use_clang_android) { deps = [ "../utils:image_utils", @@ -137,7 +175,7 @@ ohos_static_library("pixelconvertadapter_static") { } if (is_arkui_x) { - include_dirs = [ "//third_party/ffmpeg" ]. + include_dirs = [ "//third_party/ffmpeg" ] } if (use_mingw_win) { @@ -146,12 +184,14 @@ ohos_static_library("pixelconvertadapter_static") { "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ "../utils:image_utils", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform } else if (use_clang_ios) { defines = image_decode_ios_defines deps = [ @@ -159,12 +199,14 @@ ohos_static_library("pixelconvertadapter_static") { "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform } else if (use_clang_android) { deps = [ "../utils:image_utils_static", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] + deps += skia_platform libs = [ "nativewindow" ] } else { diff --git a/plugins/common/libs/image/libextplugin/BUILD.gn b/plugins/common/libs/image/libextplugin/BUILD.gn index 318a8fcfb..f3eecc22b 100644 --- a/plugins/common/libs/image/libextplugin/BUILD.gn +++ b/plugins/common/libs/image/libextplugin/BUILD.gn @@ -59,14 +59,6 @@ config("plugins_includes") { "${image_subsystem}/plugins/manager/include/pluginbase", ] } -config("skia_includes") { - include_dirs = [ - "${third_party_skia_root}", - "${third_party_skia_root}/include/codec", - "${third_party_skia_root}/include/core", - "${third_party_skia_root}/third_party/skcms", - ] -} config("third_part_includes") { include_dirs = [ "../libjpegplugin/include" ] } diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index 8a2b1d7a9..d9e72a037 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -97,21 +97,6 @@ ohos_shared_library("jpegplugin") { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] - if (DUAL_ADAPTER) { - } else { - if (image_use_new_skia) { - deps += [ "${third_party_skia_root}/third_party/libjpeg-turbo:libjpegm133" ] - } else { - deps += [ "${third_party_skia_root}/third_party/libjpeg-turbo:libjpeg" ] - } - include_dirs += [ - "$third_party_skia_root/third_party/libjpeg-turbo", - "$third_party_skia_root/third_party/externals/libjpeg-turbo", - ] - } - if (image_use_new_skia) { - defines += [ "USE_M133_SKIA" ] - } external_deps = [ "c_utils:utils", "graphic_2d:color_manager", @@ -122,6 +107,17 @@ ohos_shared_library("jpegplugin") { "libjpeg-turbo:turbojpeg", "skia:skia_canvaskit", ] + if (DUAL_ADAPTER) { + } else { + if (image_use_new_skia) { + external_deps += [ "skia:libjpegm133" ] + } else { + external_deps += [ "skia:libjpeg" ] + } + } + if (image_use_new_skia) { + defines += [ "USE_M133_SKIA" ] + } } innerapi_tags = [ "platformsdk" ] -- Gitee