From 8a8fcf8deca92758b3802ba715747d1027f4aa78 Mon Sep 17 00:00:00 2001 From: lifumin Date: Wed, 30 Jul 2025 21:00:21 +0800 Subject: [PATCH] lifumin3@h-partners.com Signed-off-by: lifumin --- .../innerkitsimpl/pixelconverter/BUILD.gn | 42 ------------------- interfaces/kits/js/common/BUILD.gn | 3 ++ .../common/libs/image/libextplugin/BUILD.gn | 8 ---- .../common/libs/image/libjpegplugin/BUILD.gn | 24 +++-------- plugins/cross/image_native_android.gni | 25 ----------- plugins/cross/image_native_ios.gni | 6 --- 6 files changed, 8 insertions(+), 100 deletions(-) diff --git a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn index f1181a4d8..54596fc76 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", @@ -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 { diff --git a/interfaces/kits/js/common/BUILD.gn b/interfaces/kits/js/common/BUILD.gn index f65040b19..c8a0241dc 100644 --- a/interfaces/kits/js/common/BUILD.gn +++ b/interfaces/kits/js/common/BUILD.gn @@ -119,6 +119,8 @@ if (use_clang_ios) { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] + external_deps = [ "skia:libjpeg", ] + #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "image_framework" @@ -295,6 +297,7 @@ if (use_clang_ios) { "ipc:ipc_single", "napi:ace_napi", "resource_management:librawfile", + "skia:libjpeg", ] public_external_deps = [ "graphic_2d:color_manager" ] 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..ee0cc39a0 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -60,13 +60,6 @@ ohos_shared_library("jpegplugin") { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/libexif:libexif", ] - 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" ] - } - deps += skia_skcms - deps += skia_platform } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ @@ -80,13 +73,6 @@ ohos_shared_library("jpegplugin") { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/libexif:libexif", ] - 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" ] - } - deps += skia_skcms - deps += skia_platform } else { defines = [ "DUAL_ADAPTER" ] DUAL_ADAPTER = true @@ -99,11 +85,6 @@ ohos_shared_library("jpegplugin") { 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", @@ -122,6 +103,11 @@ ohos_shared_library("jpegplugin") { "libjpeg-turbo:turbojpeg", "skia:skia_canvaskit", ] + if (image_use_new_skia) { + deps += [ "skia:libjpegm133" ] + } else { + deps += [ "skia:libjpeg" ] + } } innerapi_tags = [ "platformsdk" ] diff --git a/plugins/cross/image_native_android.gni b/plugins/cross/image_native_android.gni index e46843d34..f205602d2 100644 --- a/plugins/cross/image_native_android.gni +++ b/plugins/cross/image_native_android.gni @@ -160,11 +160,6 @@ image_native_android_include_dirs = [ "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "$third_party_skia_root/include/codec", - "$third_party_skia_root", - "$third_party_skia_root/include/core", - "$third_party_skia_root/third_party/skcms", "//commonlibrary/c_utils/base/include", # image_native @@ -179,24 +174,13 @@ image_native_android_include_dirs = [ "//foundation/multimedia/image_framework/interfaces/kits/native/include", "//foundation/multimedia/image_framework/interfaces/kits/native/include/image", "//utils/jni/jnikit/include", - "//foundation/graphic/graphic_surface/interfaces/inner_api/surface", - "//foundation/graphic/graphic_surface/interfaces/inner_api/utils", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/color_manager/color_space_object_convertor", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", # webp "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include", "//foundation/multimedia/image_framework/plugins/common/libs/image/libwebpplugin/include", - "$third_party_skia_root/third_party/externals/libwebp/src", - "$third_party_skia_root/include/encode", - "$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", # svg "$image_subsystem/plugins/common/libs/image/libsvgplugin/include", @@ -216,34 +200,25 @@ image_native_android_include_dirs = [ # jpeg "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", - "$third_party_skia_root/third_party/libjpeg-turbo", - "$third_party_skia_root/third_party/externals/libjpeg-turbo", - "//third_party/libexif", # gif "//foundation/multimedia/image_framework/plugins/common/libs/image/libgifplugin/include", - "//third_party/giflib", # formatagent "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/include", # png "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/include", - "//third_party/zlib", - "//third_party/libpng", # raw "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/include", "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin", "//foundation/multimedia/image_framework/plugins/common/libs/image/librawplugin/include", - "$third_party_skia_root", - "$third_party_skia_root/third_party/externals/libjpeg-turbo", # ext "//foundation/multimedia/image_framework/plugins/common/libs/image/libextplugin/include", "//foundation/multimedia/image_framework/plugins/common/libs/image/libextplugin/include/hdr", "//foundation/multimedia/image_framework/plugins/common/libs/image/libextplugin/include/jpeg_yuv_decoder", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", ] image_native_android_deps = [ diff --git a/plugins/cross/image_native_ios.gni b/plugins/cross/image_native_ios.gni index c5e73db85..f0f2c5489 100644 --- a/plugins/cross/image_native_ios.gni +++ b/plugins/cross/image_native_ios.gni @@ -231,20 +231,14 @@ image_native_ios_include_dirs = [ "//foundation/multimedia/image_framework/interfaces/kits/native/include", "//foundation/multimedia/image_framework/interfaces/kits/native/include/image", "//utils/jni/jnikit/include", - "//foundation/graphic/graphic_surface/interfaces/inner_api/surface", - "//foundation/graphic/graphic_surface/interfaces/inner_api/utils", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/color_manager/color_space_object_convertor", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "$third_party_skia_root/third_party/externals/libjpeg-turbo", # ext "//foundation/multimedia/image_framework/plugins/common/libs/image/libextplugin/include", "//foundation/multimedia/image_framework/plugins/common/libs/image/libextplugin/include/hdr", "//foundation/multimedia/image_framework/plugins/common/libs/image/libextplugin/include/jpeg_yuv_decoder", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", ] image_native_ios_deps = [ -- Gitee