From 088941f46ae251abaa79ca9a14830398a3ab827c Mon Sep 17 00:00:00 2001 From: Can Xia Date: Thu, 25 Apr 2024 18:06:29 +0800 Subject: [PATCH] fix deps warning Signed-off-by: Can Xia Change-Id: I16e727e3c0d049e47719d576f335e124fa62ca84 --- bundle.json | 20 +++--- .../innerkitsimpl/pixelconverter/BUILD.gn | 32 +-------- frameworks/innerkitsimpl/test/BUILD.gn | 47 +++++++++++-- .../unittest/jpeg_hw_decode/demo/BUILD.gn | 8 +-- frameworks/innerkitsimpl/utils/BUILD.gn | 12 +--- frameworks/kits/js/common/ndk/BUILD.gn | 27 ++++++-- .../kits/js/common/pixelmap_ndk/BUILD.gn | 7 +- frameworks/kits/native/common/ndk/BUILD.gn | 3 + interfaces/innerkits/BUILD.gn | 47 +++++-------- interfaces/kits/js/common/BUILD.gn | 44 ++---------- mock/native/BUILD.gn | 1 - .../libs/image/formatagentplugin/BUILD.gn | 2 - .../common/libs/image/libbmpplugin/BUILD.gn | 10 --- .../image/libbmpplugin/include/bmp_decoder.h | 2 +- .../image/libbmpplugin/include/bmp_stream.h | 2 +- .../common/libs/image/libextplugin/BUILD.gn | 69 ++++++------------- .../image/libextplugin/include/ext_decoder.h | 2 +- .../image/libextplugin/include/ext_encoder.h | 4 +- .../image/libextplugin/include/ext_stream.h | 2 +- .../image/libextplugin/include/ext_wstream.h | 2 +- .../include/hardware/jpeg_hw_decoder.h | 2 +- .../image/libextplugin/src/ext_encoder.cpp | 3 +- .../common/libs/image/libgifplugin/BUILD.gn | 15 ---- .../common/libs/image/libjpegplugin/BUILD.gn | 14 +--- .../common/libs/image/libpngplugin/BUILD.gn | 22 ++---- .../common/libs/image/librawplugin/BUILD.gn | 9 +-- .../common/libs/image/libsvgplugin/BUILD.gn | 2 - .../common/libs/image/libwebpplugin/BUILD.gn | 14 +--- .../libwebpplugin/include/webp_encoder.h | 3 +- plugins/cross/image_native_android.gni | 1 - plugins/cross/image_native_ios.gni | 1 - plugins/manager/BUILD.gn | 12 +--- 32 files changed, 154 insertions(+), 287 deletions(-) diff --git a/bundle.json b/bundle.json index 303f1267a..cf886b1e3 100644 --- a/bundle.json +++ b/bundle.json @@ -26,6 +26,7 @@ "hisysevent_config": [ "//foundation/multimedia/image_framework/hisysevent.yaml" ], "deps": { "components": [ + "ability_runtime", "c_utils", "graphic_2d", "graphic_surface", @@ -40,25 +41,26 @@ "memory_utils", "drivers_interface_codec", "drivers_interface_display", + "drivers_peripheral_display", "hdf_core", "memmgr_override", "libyuv", "libjpeg-turbo", "libexif", - "zlib", - "resource_management" + "libpng", + "opencl-headers", + "ffmpeg", + "astc-encoder", + "skia", + "resource_management", + "json", + "openmax" ], "third_party": [ "flutter", - "libpng", "bounds_checking_function", "expat", - "json", - "skia", - "astc-encoder", - "opencl-headers", - "ffmpeg", - "zlib" + "skia" ] }, "build": { diff --git a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn index c4719a16c..b271bbede 100644 --- a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn +++ b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn @@ -17,23 +17,9 @@ import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") config("pixelconvertadapter_public_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/ipc/utils/include", - "//foundation/multimedia/media_utils_lite/interfaces/kits", "${image_subsystem}/frameworks/innerkitsimpl/utils/include", - "$skia_root/skia/include/core", - "$skia_root/skia/include/encode", - "$skia_root/skia", - "$skia_root/skia/src/ports/skia_ohos", - "$skia_root/skia/src/ports", - "$skia_root/skia/src/images", - "$skia_root/skia/src/ports/skia_ohos", - "$skia_root/skia/third_party/externals/freetype/include/freetype", - "$skia_root/skia/include/private", - "//third_party/bounds_checking_function/include", ] if (use_mingw_win) { @@ -87,7 +73,6 @@ config("pixelconvertadapter_public_config") { "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/utils/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$skia_root/skia/include/core", "$skia_root/skia/include/encode", "$skia_root/skia", "$skia_root/skia/src/ports/skia_ohos", @@ -99,22 +84,6 @@ config("pixelconvertadapter_public_config") { "//third_party/bounds_checking_function/include", "$image_subsystem/mock/native/include/log", ] - } else { - include_dirs += [ - "//commonlibrary/c_utils/base/include", - "//foundation/communication/ipc/utils/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$skia_root/skia/include/core", - "$skia_root/skia/include/encode", - "$skia_root/skia", - "$skia_root/skia/src/ports/skia_ohos", - "$skia_root/skia/src/ports", - "$skia_root/skia/src/images", - "//third_party/expat/lib", - "$skia_root/skia/include/private", - "$skia_root/skia/third_party/externals/freetype/include/freetype", - "//third_party/bounds_checking_function/include", - ] } } @@ -224,6 +193,7 @@ ohos_static_library("pixelconvertadapter_static") { external_deps = [ "c_utils:utils", + "graphic_2d:color_manager", "hilog:libhilog", ] } diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index 96e5187ce..a6cb546d8 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -51,6 +51,8 @@ ohos_unittest("pixelmaptest") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", ] @@ -199,6 +201,8 @@ ohos_unittest("imagesourcetest") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", "hilog:libhilog", ] @@ -236,7 +240,11 @@ ohos_unittest("jpegdecoderextest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "libexif:libexif", + "skia:libjpeg", + ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" } @@ -265,6 +273,8 @@ ohos_unittest("jpegutilstest") { external_deps = [ "c_utils:utils", "hilog:libhilog", + "libexif:libexif", + "skia:libjpeg", ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" @@ -294,6 +304,8 @@ ohos_unittest("exifmakernotetest") { external_deps = [ "c_utils:utils", "hilog:libhilog", + "libexif:libexif", + "skia:libjpeg", ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" @@ -476,6 +488,8 @@ ohos_unittest("interfacetest") { resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", "hilog:libhilog", ] } @@ -733,6 +747,8 @@ ohos_unittest("receivertest") { resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", "hilog:libhilog", ] } @@ -804,6 +820,8 @@ ohos_unittest("creatortest") { resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", "hilog:libhilog", ] } @@ -1069,6 +1087,11 @@ ohos_unittest("ndktest2") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "graphic_2d:color_manager", + "graphic_surface:surface", + ] } ohos_unittest("napitest") { @@ -1090,6 +1113,8 @@ ohos_unittest("napitest") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] + + external_deps = [ "graphic_2d:color_manager" ] } ohos_unittest("jpeg_hw_decoder_test") { @@ -1137,10 +1162,13 @@ ohos_unittest("jpeg_hw_decoder_test") { "drivers_interface_display:display_composer_idl_headers", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_composer_hdi_impl", + "graphic_surface:surface", "hdf_core:libhdf_utils", "hdf_core:libhdi", "hilog:libhilog", "ipc:ipc_single", + "libexif:libexif", + "skia:libjpeg", ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" @@ -1347,7 +1375,10 @@ ohos_unittest("jpeg_yuv_decoder_test") { "${image_subsystem}/plugins/manager:pluginmanager", ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "skia:libjpeg", + ] } ohos_unittest("imagestreamtest") { @@ -1519,7 +1550,11 @@ ohos_unittest("image_native_test") { "${image_subsystem}/interfaces/innerkits:image_native", ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", + ] } ohos_unittest("image_receiver_native_test") { @@ -1543,7 +1578,11 @@ ohos_unittest("image_receiver_native_test") { "${image_subsystem}/interfaces/innerkits:image_native", ] resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml" - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", + ] } ohos_unittest("datastatisticstest") { diff --git a/frameworks/innerkitsimpl/test/unittest/jpeg_hw_decode/demo/BUILD.gn b/frameworks/innerkitsimpl/test/unittest/jpeg_hw_decode/demo/BUILD.gn index 038485322..b1a79a037 100644 --- a/frameworks/innerkitsimpl/test/unittest/jpeg_hw_decode/demo/BUILD.gn +++ b/frameworks/innerkitsimpl/test/unittest/jpeg_hw_decode/demo/BUILD.gn @@ -38,12 +38,6 @@ ohos_executable("jpeg_hw_decoder_demo") { "${image_subsystem}/plugins/manager/include/", "${image_subsystem}/frameworks/innerkitsimpl/stream/include/", "${image_subsystem}/interfaces/innerkits/include/", - "${image_subsystem}/../../../drivers/peripheral/base/", - "${image_subsystem}/../../../drivers/peripheral/display/interfaces/include/", - "${image_subsystem}/../../../third_party/skia/", - "${image_subsystem}/../../../third_party/skia/include/codec/", - "${image_subsystem}/../../../third_party/skia/include/core/", - "${image_subsystem}/../../../third_party/libjpeg-turbo/", ] deps = [ "${image_subsystem}/interfaces/innerkits:image_native", @@ -57,9 +51,11 @@ ohos_executable("jpeg_hw_decoder_demo") { "drivers_interface_display:display_composer_idl_headers", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_composer_hdi_impl", + "drivers_peripheral_display:hdi_gralloc_client", "hdf_core:libhdf_utils", "hdf_core:libhdi", "hilog:libhilog", "ipc:ipc_single", + "skia:libjpeg", ] } diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index f2e2e4f9a..0e3a59b80 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -57,14 +57,8 @@ if (use_clang_ios) { } include_dirs = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/media_utils_lite/interfaces/kits", - "//foundation/communication/ipc/utils/include", - "$skia_root/skia", - "${graphic_subsystem}/interfaces/inner_api/surface", ] sources = [ @@ -143,11 +137,8 @@ if (use_clang_ios) { ohos_static_library("image_utils_static") { include_dirs = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//commonlibrary/c_utils/base/include", - "$skia_root/skia", ] sources = [ @@ -208,6 +199,9 @@ ohos_static_library("image_utils_static") { external_deps = [ "c_utils:utils", + "drivers_interface_display:display_commontype_idl_headers", + "graphic_2d:color_manager", + "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/frameworks/kits/js/common/ndk/BUILD.gn b/frameworks/kits/js/common/ndk/BUILD.gn index da3d91e0e..1034b8bb8 100644 --- a/frameworks/kits/js/common/ndk/BUILD.gn +++ b/frameworks/kits/js/common/ndk/BUILD.gn @@ -16,18 +16,13 @@ import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") SEPARATOR = "/" BASE_DIR = "$SEPARATOR/foundation" -THIRD_DIR = "$SEPARATOR/third_party" config("native_public_config") { include_dirs = [ "include", - "$BASE_DIR/arkui/napi/interfaces/inner_api", - "$BASE_DIR/arkui/napi/interfaces/kits", "$BASE_DIR/multimedia/image_framework/interfaces/kits/native/include", "$BASE_DIR/multimedia/image_framework/interfaces/kits/native/include/image", "$BASE_DIR/multimedia/image_framework/interfaces/innerkits/include", - "$THIRD_DIR/node/src", - "$resource_management_subsystem/interfaces/native/resource/include", "$BASE_DIR/multimedia/image_framework/frameworks/kits/js/common/pixelmap_ndk", ] } @@ -42,6 +37,10 @@ ohos_shared_library("image_ndk") { sources = [ "image_mdk.cpp" ] public_configs = [ ":native_public_config" ] deps = [ "$image_subsystem/interfaces/kits/js/common:image" ] + external_deps = [ + "graphic_surface:surface", + "napi:ace_napi", + ] innerapi_tags = [ "ndk" ] subsystem_name = "multimedia" @@ -58,6 +57,12 @@ ohos_shared_library("image_receiver_ndk") { sources = [ "image_receiver_mdk.cpp" ] public_configs = [ ":native_public_config" ] deps = [ "$image_subsystem/interfaces/kits/js/common:image" ] + external_deps = [ + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_2d:color_manager", + "graphic_surface:surface", + "napi:ace_napi", + ] innerapi_tags = [ "ndk" ] subsystem_name = "multimedia" @@ -75,6 +80,11 @@ ohos_shared_library("image_source_ndk") { public_configs = [ ":native_public_config" ] deps = [ "$image_subsystem/interfaces/kits/js/common:image" ] + external_deps = [ + "napi:ace_napi", + "resource_management:librawfile", + ] + innerapi_tags = [ "ndk" ] subsystem_name = "multimedia" part_name = "image_framework" @@ -91,6 +101,8 @@ ohos_shared_library("image_packer_ndk") { public_configs = [ ":native_public_config" ] deps = [ "$image_subsystem/interfaces/kits/js/common:image" ] + external_deps = [ "napi:ace_napi" ] + innerapi_tags = [ "ndk" ] subsystem_name = "multimedia" part_name = "image_framework" @@ -161,7 +173,10 @@ ohos_shared_library("image_packer") { "$image_subsystem/interfaces/kits/js/common:image", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "resource_management:librawfile", + ] innerapi_tags = [ "ndk" ] subsystem_name = "multimedia" diff --git a/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn b/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn index aa7bfb3bd..677412d90 100644 --- a/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn +++ b/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn @@ -25,9 +25,6 @@ ohos_shared_library("pixelmap_ndk") { include_dirs = [ "${image_subsystem}/interfaces/innerkits/include/mdkKits", "include", - "//foundation/arkui/napi/interfaces/inner_api", - "//foundation/arkui/napi/interfaces/kits", - "//third_party/node/src", ] sources = [ @@ -39,6 +36,10 @@ ohos_shared_library("pixelmap_ndk") { [ "$SUBSYSTEM_DIR/interfaces/innerkits:image_external_config" ] deps = [ "$SUBSYSTEM_DIR/interfaces/kits/js/common:image" ] + external_deps = [ + "graphic_2d:color_manager", + "napi:ace_napi", + ] innerapi_tags = [ "ndk" ] subsystem_name = "multimedia" diff --git a/frameworks/kits/native/common/ndk/BUILD.gn b/frameworks/kits/native/common/ndk/BUILD.gn index 232c4d372..9c33cf05d 100644 --- a/frameworks/kits/native/common/ndk/BUILD.gn +++ b/frameworks/kits/native/common/ndk/BUILD.gn @@ -40,6 +40,7 @@ ohos_shared_library("ohimage") { external_deps = [ "c_utils:utils", + "graphic_surface:surface", "hilog:libhilog", ] @@ -66,6 +67,8 @@ ohos_shared_library("image_receiver") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_surface:surface", "hilog:libhilog", ] diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index d6e1b1a5d..a5a718ab2 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -21,8 +21,6 @@ import("$image_subsystem/plugins/cross/image_native_ios.gni") config("image_external_config") { include_dirs = [ "include", - "//utils/system/safwk/native/include", - "//foundation/ability/ability_runtime/interfaces/inner_api/runtime/include/", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include", @@ -34,23 +32,12 @@ config("image_external_config") { "${image_subsystem}/frameworks/innerkitsimpl/accessor/include", "//foundation/multimedia/image_framework/frameworks/kits/js/common/include", "//foundation/multimedia/image_framework/interfaces/kits/js/common/include", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin", "${image_subsystem}/plugins/common/libs/image/libextplugin/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/interfaces/kits/native/include", - "//utils/jni/jnikit/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$graphic_surface_root/interfaces/inner_api/surface", - "//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", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", "${image_subsystem}/frameworks/kits/js/common/ndk/include", ] @@ -60,12 +47,6 @@ config("image_external_config") { "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", "${image_subsystem}/plugins/common/libs/image/libextplugin/include/heif_impl/heif_parser", - "$skia_root/skia", - "$skia_root/skia/include/core", - "$skia_root/skia/include/codec", - "$skia_root/skia/third_party/externals/libjpeg-turbo", - "$skia_root/skia/third_party/skcms", - "//third_party/libexif", ] if (use_mingw_win) { @@ -78,11 +59,6 @@ config("image_external_config") { "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] - } else { - include_dirs += [ - "//commonlibrary/c_utils/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - ] } } @@ -139,7 +115,6 @@ if (use_clang_android) { } } public_configs = [ ":image_external_config" ] - configs = [ ":image_postproc_config" ] cflags = [ "-DIMAGE_DEBUG_FLAG", @@ -235,7 +210,6 @@ if (use_clang_android) { "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", - "//third_party/ffmpeg:libohosffmpeg", ] deps += skia_platform @@ -246,14 +220,19 @@ if (use_clang_android) { external_deps = [ "c_utils:utils", "drivers_interface_display:display_commontype_idl_headers", - "graphic_2d:color_manager", - "graphic_surface:surface", + "ffmpeg:libohosffmpeg", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "napi:ace_napi", + "skia:libjpeg", "zlib:libz", ] + public_external_deps = [ + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_2d:color_manager", + "graphic_surface:surface", + ] if (enable_libexif) { external_deps += [ "libexif:libexif" ] } @@ -387,12 +366,14 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] } else { - defines = [ "DUAL_ADAPTER" ] + defines = [ + "DUAL_ADAPTER", + "IMAGE_COLORSPACE_FLAG", + ] DUAL_ADAPTER = true deps = [ "$image_subsystem/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", - "//foundation/arkui/napi:ace_napi", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] @@ -404,10 +385,16 @@ ohos_static_library("image_static") { external_deps = [ "c_utils:utils", "drivers_interface_display:display_commontype_idl_headers", + "drivers_peripheral_display:hdi_gralloc_client", + "ffmpeg:libohosffmpeg", "graphic_2d:color_manager", "graphic_surface:surface", "hilog:libhilog", + "napi:ace_napi", ] + if (enable_libexif) { + external_deps += [ "libexif:libexif" ] + } } external_deps += [ "zlib:libz" ] diff --git a/interfaces/kits/js/common/BUILD.gn b/interfaces/kits/js/common/BUILD.gn index 4af4cb871..d533fe0a4 100644 --- a/interfaces/kits/js/common/BUILD.gn +++ b/interfaces/kits/js/common/BUILD.gn @@ -13,15 +13,12 @@ import("//build/ohos.gni") import("//build/ohos/ace/ace.gni") -import("//foundation/graphic/graphic_2d/graphic_config.gni") import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") config("image_external_config") { include_dirs = [ "include", - "//utils/system/safwk/native/include", "${image_subsystem}/frameworks/kits/js/common/ndk/include", - "//foundation/ability/ability_runtime/interfaces/inner_api/runtime/include/", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include", @@ -33,25 +30,11 @@ config("image_external_config") { "${image_subsystem}/frameworks/innerkitsimpl/accessor/include", "//foundation/multimedia/image_framework/frameworks/kits/js/common/include", "//foundation/multimedia/image_framework/interfaces/kits/js/common/include", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/interfaces/kits/native/include", - "//utils/jni/jnikit/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "$graphic_surface_root/interfaces/inner_api/surface", - "//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", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "$resource_management_subsystem/interfaces/native/resource/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "$skia_root/skia/third_party/externals/libjpeg-turbo", - "$ipc_subsystem/communication/ipc/ipc/native/src/napi_common/include", ] include_dirs += [ @@ -59,13 +42,6 @@ config("image_external_config") { "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", - "$skia_root/skia/include/codec", - "$skia_root/skia", - "$skia_root/skia/include/core", - "$skia_root/skia/third_party/libjpeg-turbo", - "$skia_root/skia/third_party/skcms", - "//third_party/libexif", - "//third_party/zlib", ] if (use_mingw_win) { @@ -86,10 +62,6 @@ config("image_external_config") { include_dirs -= [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include", - "$graphic_surface_root/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/graphic/graphic_2d/utils/color_manager/export", ] } else if (use_clang_android) { include_dirs += [ @@ -100,15 +72,6 @@ config("image_external_config") { include_dirs -= [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include", - "$graphic_surface_root/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - ] - } else { - include_dirs += [ - "//commonlibrary/c_utils/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] } } @@ -177,6 +140,9 @@ if (use_clang_ios) { ] external_deps = [ + "drivers_peripheral_display:hdi_gralloc_client", + "graphic_2d:color_manager", + "graphic_surface:surface", "hilog:libhilog", "napi:ace_napi", ] @@ -249,6 +215,7 @@ if (use_clang_ios) { } external_deps += [ + "ability_runtime:runtime", "c_utils:utils", "graphic_2d:color_manager", "graphic_2d:color_space_object_convertor", @@ -259,8 +226,11 @@ if (use_clang_ios) { "hitrace:hitrace_meter", "ipc:ipc_napi", "napi:ace_napi", + "resource_management:librawfile", ] + public_external_deps = [ "graphic_2d:color_manager" ] + if (defined(global_parts_info) && defined(global_parts_info.hiviewdfx_hichecker)) { external_deps += [ "hichecker:libhichecker" ] diff --git a/mock/native/BUILD.gn b/mock/native/BUILD.gn index e92c7ca4f..d001f75f6 100644 --- a/mock/native/BUILD.gn +++ b/mock/native/BUILD.gn @@ -39,7 +39,6 @@ config("utils_mock_config") { visibility = [ ":*" ] include_dirs = [ "include", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] } diff --git a/plugins/common/libs/image/formatagentplugin/BUILD.gn b/plugins/common/libs/image/formatagentplugin/BUILD.gn index 1518dddf7..6e889e47f 100644 --- a/plugins/common/libs/image/formatagentplugin/BUILD.gn +++ b/plugins/common/libs/image/formatagentplugin/BUILD.gn @@ -36,7 +36,6 @@ ohos_shared_library("imageformatagent") { ] include_dirs = [ - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", @@ -63,7 +62,6 @@ ohos_shared_library("imageformatagent") { "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else { - include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] diff --git a/plugins/common/libs/image/libbmpplugin/BUILD.gn b/plugins/common/libs/image/libbmpplugin/BUILD.gn index 3f5ea15e5..b72307223 100644 --- a/plugins/common/libs/image/libbmpplugin/BUILD.gn +++ b/plugins/common/libs/image/libbmpplugin/BUILD.gn @@ -29,7 +29,6 @@ ohos_shared_library("bmpplugin") { ] include_dirs = [ - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", @@ -37,14 +36,6 @@ ohos_shared_library("bmpplugin") { "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "${image_subsystem}/frameworks/innerkitsimpl/utils/include", - "$skia_root/skia/include/core", - "$skia_root/skia/include/codec", - "$skia_root/skia", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "$skia_root/skia/include/codec", - "$skia_root/skia", - "$skia_root/skia/include/core", - "//third_party/skia/third_party/skcms", ] if (use_mingw_win) { defines = image_decode_windows_defines @@ -83,7 +74,6 @@ ohos_shared_library("bmpplugin") { "//third_party/bounds_checking_function:libsec_static", ] } else { - include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", diff --git a/plugins/common/libs/image/libbmpplugin/include/bmp_decoder.h b/plugins/common/libs/image/libbmpplugin/include/bmp_decoder.h index a2cdc4f3b..5fd2bd7a2 100644 --- a/plugins/common/libs/image/libbmpplugin/include/bmp_decoder.h +++ b/plugins/common/libs/image/libbmpplugin/include/bmp_decoder.h @@ -18,7 +18,7 @@ #include #include -#include "SkCodec.h" +#include "include/codec/SkCodec.h" #include "abs_image_decoder.h" #include "bmp_stream.h" #include "plugin_class_base.h" diff --git a/plugins/common/libs/image/libbmpplugin/include/bmp_stream.h b/plugins/common/libs/image/libbmpplugin/include/bmp_stream.h index 863e42bb4..38635c2fc 100644 --- a/plugins/common/libs/image/libbmpplugin/include/bmp_stream.h +++ b/plugins/common/libs/image/libbmpplugin/include/bmp_stream.h @@ -18,7 +18,7 @@ #include #include -#include "SkStream.h" +#include "include/core/SkStream.h" #include "input_data_stream.h" #include "nocopyable.h" diff --git a/plugins/common/libs/image/libextplugin/BUILD.gn b/plugins/common/libs/image/libextplugin/BUILD.gn index 702a9eccf..925db3de2 100644 --- a/plugins/common/libs/image/libextplugin/BUILD.gn +++ b/plugins/common/libs/image/libextplugin/BUILD.gn @@ -13,11 +13,13 @@ import("//build/ohos.gni") import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") -third_party_dir = "/third_party" -third_party_root = "/${third_party_dir}" if (use_mingw_win || use_clang_mac) { graphic_root = "/${image_sep_f}${image_oundation}/${graphic_multimedia}" } +if (use_clang_mac) { + third_party_dir = "/third_party" + third_party_root = "/${third_party_dir}" +} ohos_static_library("exifhelper") { if (!use_clang_android && !use_clang_ios) { @@ -35,7 +37,6 @@ ohos_static_library("exifhelper") { "../libjpegplugin/include", "${image_subsystem}/frameworks/innerkitsimpl/utils/include", "${image_subsystem}/interfaces/innerkits/include", - "//third_party/libexif", ] external_deps = [ @@ -65,10 +66,7 @@ config("skia_includes") { ] } config("third_part_includes") { - include_dirs = [ - "../libjpegplugin/include", - "${third_party_root}/libexif", - ] + include_dirs = [ "../libjpegplugin/include" ] } config("win_config") { if (use_mingw_win) { @@ -116,10 +114,10 @@ ohos_shared_library("textureEncoderCL") { } else if (use_clang_mac) { configs += [ ":mac_config" ] } else { - deps = [ "//third_party/opencl-headers:libcl" ] external_deps = [ "c_utils:utils", "hilog:libhilog", + "opencl-headers:libcl", ] } cflags = [ "-O3" ] @@ -168,7 +166,6 @@ ohos_shared_library("extplugin") { } configs = [ ":plugins_includes", - ":skia_includes", ":third_part_includes", ] include_dirs = [ @@ -179,20 +176,6 @@ ohos_shared_library("extplugin") { "${image_subsystem}/interfaces/innerkits/include", "${image_subsystem}/frameworks/innerkitsimpl/utils/include", "${image_subsystem}/frameworks/innerkitsimpl/accessor/include", - "${graphic_subsystem}/interfaces/inner_api/surface", - "${image_subsystem}/../../../drivers/peripheral/base/", - "${image_subsystem}/../../../drivers/peripheral/display/interfaces/include/", - "${image_subsystem}/../../../third_party/skia/", - "${image_subsystem}/../../../third_party/skia/include/codec/", - "${image_subsystem}/../../../third_party/skia/include/core/", - "${image_subsystem}/../../../third_party/libjpeg-turbo/", - "//third_party/astc-encoder/Source", - "//third_party/skia", - "//third_party/skia/include/codec", - "//third_party/skia/include/core", - "//third_party/libjpeg-turbo", - "${image_subsystem}/../../../drivers/peripheral/base", - "${image_subsystem}/../../../drivers/peripheral/display/interfaces/include", ] if (use_mingw_win) { configs += [ ":win_config" ] @@ -215,7 +198,6 @@ ohos_shared_library("extplugin") { "${third_party_root}/bounds_checking_function:libsec_static", ] } else { - include_dirs += [ "${commonlibrary_subsystem}/base/include" ] defines = [] deps = [ ":exifhelper", @@ -224,29 +206,31 @@ ohos_shared_library("extplugin") { "${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils", "${image_subsystem}/interfaces/innerkits:image_native", "${image_subsystem}/plugins/manager:pluginmanager", - "//third_party/astc-encoder:astc_encoder_shared", ] - if (defined(global_parts_info) && - defined(global_parts_info.open_source_libyuv)) { - defines += [ "ENABLE_ASTC_ENCODE_BASED_GPU" ] - deps += [ - ":textureEncoderCL", - "//third_party/opencl-headers:libcl", - ] - } deps += skia_platform external_deps = [ + "astc-encoder:astc_encoder_shared", "c_utils:utils", "drivers_interface_display:display_commontype_idl_headers", + "drivers_peripheral_display:hdi_gralloc_client", "graphic_2d:color_manager", "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", + "libexif:libexif", "libjpeg-turbo:turbojpeg", + "skia:libjpeg", "zlib:libz", ] + if (defined(global_parts_info) && + defined(global_parts_info.open_source_libyuv)) { + defines += [ "ENABLE_ASTC_ENCODE_BASED_GPU" ] + deps += [ ":textureEncoderCL" ] + external_deps += [ "opencl-headers:libcl" ] + } + if (defined(global_parts_info) && defined(global_parts_info.graphic_graphic_2d_ext)) { defines += [ "SUT_ENCODE_ENABLE" ] @@ -269,13 +253,11 @@ ohos_shared_library("extplugin") { if (enable_heif_hw_decode) { defines += [ "HEIF_HW_DECODE_ENABLE" ] - include_dirs += [ - "include/heif_impl/heif_parser", - "//third_party/openmax/api/1.1.2", - ] + include_dirs += [ "include/heif_impl/heif_parser" ] external_deps += [ "drivers_interface_codec:codec_idl_headers", "drivers_peripheral_codec:libcodec_hdi_omx_client", + "openmax:libopenmax_static", ] } } @@ -378,13 +360,6 @@ ohos_shared_library("heifimpl") { "${image_subsystem}/interfaces/innerkits/include", ] - if (enable_heif_hw_decode) { - include_dirs += [ - "//third_party/ffmpeg", - "//third_party/openmax/api/1.1.2", - ] - } - sources = [ "src/heif_impl/HeifDecoderImpl.cpp" ] if (enable_heif_hw_decode) { @@ -409,10 +384,6 @@ ohos_shared_library("heifimpl") { "${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils", ] - if (enable_heif_hw_decode) { - deps += [ "//third_party/ffmpeg:libohosffmpeg" ] - } - external_deps = [ "graphic_2d:color_manager", "graphic_surface:surface", @@ -425,9 +396,11 @@ ohos_shared_library("heifimpl") { "drivers_interface_codec:codec_idl_headers", "drivers_interface_codec:libcodec_proxy_2.0", "drivers_peripheral_codec:libcodec_hdi_omx_client", + "ffmpeg:libohosffmpeg", "hdf_core:libhdi", "init:libbegetutil", "ipc:ipc_core", + "openmax:libopenmax_static", "qos_manager:qos", ] } diff --git a/plugins/common/libs/image/libextplugin/include/ext_decoder.h b/plugins/common/libs/image/libextplugin/include/ext_decoder.h index e452758bd..a3698ca2b 100644 --- a/plugins/common/libs/image/libextplugin/include/ext_decoder.h +++ b/plugins/common/libs/image/libextplugin/include/ext_decoder.h @@ -19,7 +19,6 @@ #include #include -#include "SkCodec.h" #include "abs_image_decoder.h" #if !defined(IOS_PLATFORM) && !defined(ANDROID_PLATFORM) #include "display_type.h" @@ -27,6 +26,7 @@ #endif #include "ext_stream.h" #include "exif_info.h" +#include "include/codec/SkCodec.h" #include "nocopyable.h" #include "plugin_class_base.h" #include "jpeg_yuv_decoder/jpeg_decoder_yuv.h" diff --git a/plugins/common/libs/image/libextplugin/include/ext_encoder.h b/plugins/common/libs/image/libextplugin/include/ext_encoder.h index 215c7e2c8..1f17704a5 100644 --- a/plugins/common/libs/image/libextplugin/include/ext_encoder.h +++ b/plugins/common/libs/image/libextplugin/include/ext_encoder.h @@ -20,9 +20,9 @@ #include "abs_image_encoder.h" #include "plugin_class_base.h" -#include "SkEncodedImageFormat.h" #include "ext_wstream.h" -#include "SkBitmap.h" +#include "include/core/SkBitmap.h" +#include "include/core/SkEncodedImageFormat.h" #include "surface_buffer.h" namespace OHOS { diff --git a/plugins/common/libs/image/libextplugin/include/ext_stream.h b/plugins/common/libs/image/libextplugin/include/ext_stream.h index ff7118800..50d77330e 100644 --- a/plugins/common/libs/image/libextplugin/include/ext_stream.h +++ b/plugins/common/libs/image/libextplugin/include/ext_stream.h @@ -18,7 +18,7 @@ #include -#include "SkStream.h" +#include "include/core/SkStream.h" #include "input_data_stream.h" #include "nocopyable.h" diff --git a/plugins/common/libs/image/libextplugin/include/ext_wstream.h b/plugins/common/libs/image/libextplugin/include/ext_wstream.h index ce41e397a..937ed1942 100644 --- a/plugins/common/libs/image/libextplugin/include/ext_wstream.h +++ b/plugins/common/libs/image/libextplugin/include/ext_wstream.h @@ -18,7 +18,7 @@ #include #include -#include "SkStream.h" +#include "include/core/SkStream.h" #include "output_data_stream.h" #include "nocopyable.h" #include "buffer_metadata_stream.h" diff --git a/plugins/common/libs/image/libextplugin/include/hardware/jpeg_hw_decoder.h b/plugins/common/libs/image/libextplugin/include/hardware/jpeg_hw_decoder.h index da234c8b3..d22aea2fa 100644 --- a/plugins/common/libs/image/libextplugin/include/hardware/jpeg_hw_decoder.h +++ b/plugins/common/libs/image/libextplugin/include/hardware/jpeg_hw_decoder.h @@ -21,8 +21,8 @@ #include "v1_0/include/idisplay_buffer.h" #include "image/image_plugin_type.h" #include "image/input_data_stream.h" +#include "include/codec/SkCodec.h" #include "image_log.h" -#include "SkCodec.h" #include "jpeglib.h" #undef LOG_DOMAIN diff --git a/plugins/common/libs/image/libextplugin/src/ext_encoder.cpp b/plugins/common/libs/image/libextplugin/src/ext_encoder.cpp index 3be953905..2125192d4 100644 --- a/plugins/common/libs/image/libextplugin/src/ext_encoder.cpp +++ b/plugins/common/libs/image/libextplugin/src/ext_encoder.cpp @@ -17,8 +17,7 @@ #include #include -#include "SkBitmap.h" -#include "SkImageEncoder.h" +#include "include/core/SkImageEncoder.h" #ifdef IMAGE_COLORSPACE_FLAG #include "color_space.h" #endif diff --git a/plugins/common/libs/image/libgifplugin/BUILD.gn b/plugins/common/libs/image/libgifplugin/BUILD.gn index b4966c3aa..f64cc4224 100644 --- a/plugins/common/libs/image/libgifplugin/BUILD.gn +++ b/plugins/common/libs/image/libgifplugin/BUILD.gn @@ -28,20 +28,12 @@ ohos_shared_library("gifplugin") { ] include_dirs = [ - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", "//foundation/multimedia/image_framework/plugins/common/libs/image/libgifplugin/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", - - #"//third_party/giflib", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "$skia_root/skia/include/codec", - "$skia_root/skia", - "$skia_root/skia/include/core", - "//third_party/skia/third_party/skcms", ] if (use_mingw_win) { @@ -51,8 +43,6 @@ ohos_shared_library("gifplugin") { deps = [ "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", - - #"//third_party/giflib:gif_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines @@ -64,16 +54,11 @@ ohos_shared_library("gifplugin") { "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/bounds_checking_function:libsec_static", - - #"//third_party/giflib:gif_static", ] } else { - include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ "${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", - - #"//third_party/giflib:libgif", ] external_deps = [ diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index 05079bba8..4f8c312b5 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("jpegplugin") { @@ -38,7 +37,6 @@ ohos_shared_library("jpegplugin") { ] include_dirs = [ - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", @@ -46,14 +44,6 @@ ohos_shared_library("jpegplugin") { "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "$skia_root/skia/include/codec", - "$skia_root/skia", - "$skia_root/skia/include/core", - "//third_party/skia/third_party/libjpeg-turbo", - "//third_party/skia/third_party/externals/libjpeg-turbo", - "//third_party/skia/third_party/skcms", - "//third_party/libexif", ] if (use_mingw_win) { @@ -91,17 +81,14 @@ ohos_shared_library("jpegplugin") { } else { defines = [ "DUAL_ADAPTER" ] DUAL_ADAPTER = true - include_dirs += [ "//commonlibrary/c_utils/base/include" ] sources += [ "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp", "//third_party/skia/third_party/externals/libjpeg-turbo/jdicc.c", ] deps = [ - #"//third_party/skia/third_party/libjpeg-turbo:libjpeg", "${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", - "//third_party/skia/third_party/libjpeg-turbo:libjpeg", ] deps += skia_skcms deps += skia_platform @@ -122,6 +109,7 @@ ohos_shared_library("jpegplugin") { "hilog:libhilog", "hitrace:hitrace_meter", "libexif:libexif", + "skia:libjpeg", ] } diff --git a/plugins/common/libs/image/libpngplugin/BUILD.gn b/plugins/common/libs/image/libpngplugin/BUILD.gn index fd062fe90..d78fef05d 100644 --- a/plugins/common/libs/image/libpngplugin/BUILD.gn +++ b/plugins/common/libs/image/libpngplugin/BUILD.gn @@ -29,25 +29,15 @@ ohos_shared_library("pngplugin") { "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/src/png_ninepatch_res.cpp", ] include_dirs = [ - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/include", - "//third_party/zlib", "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", - "//third_party/skia/third_party/libjpeg-turbo", - "//foundation/graphic/graphic_2d/utils/color_manager/export", - "$skia_root/skia/include/codec", - "$skia_root/skia", - "$skia_root/skia/include/core", - "//third_party/skia/third_party/skcms", - ] - deps = [ - "//third_party/libpng:png_static", - "//third_party/zlib:shared_libz", ] + deps = [] + external_deps = [ "zlib:shared_libz" ] if (use_mingw_win) { defines = image_decode_windows_defines @@ -77,24 +67,20 @@ ohos_shared_library("pngplugin") { } else { defines = [ "DUAL_ADAPTER" ] DUAL_ADAPTER = true - include_dirs += [ - "//commonlibrary/c_utils/base/include", - "//third_party/libpng", - ] deps += [ "${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", - "//third_party/libpng:png_static", ] if (DUAL_ADAPTER) { } else { deps += [ "//third_party/libpng:libpng" ] } - external_deps = [ + external_deps += [ "c_utils:utils", "graphic_2d:color_manager", "graphic_surface:surface", "hilog:libhilog", + "libpng:libpng", ] } cflags = [ "-DIMAGE_COLORSPACE_FLAG" ] diff --git a/plugins/common/libs/image/librawplugin/BUILD.gn b/plugins/common/libs/image/librawplugin/BUILD.gn index b12df4a56..18a66948c 100644 --- a/plugins/common/libs/image/librawplugin/BUILD.gn +++ b/plugins/common/libs/image/librawplugin/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("rawplugin") { ] include_dirs = [ - "//foundation/graphic/graphic_2d/utils/color_manager/export", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", @@ -43,10 +42,6 @@ ohos_shared_library("rawplugin") { "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", - "//third_party/libexif", - "//third_party/skia", - "//third_party/skia/third_party/externals/libjpeg-turbo", - "//foundation/graphic/graphic_2d/utils/color_manager/export", ] if (use_mingw_win) { @@ -68,7 +63,6 @@ ohos_shared_library("rawplugin") { "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin:jpegplugin", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", - "//third_party/skia/third_party/piex", ] if (DUAL_ADAPTER) { @@ -77,6 +71,9 @@ ohos_shared_library("rawplugin") { external_deps = [ "graphic_2d:color_manager", "hilog:libhilog", + "libexif:libexif", + "skia:libjpeg", + "skia:piex", ] } diff --git a/plugins/common/libs/image/libsvgplugin/BUILD.gn b/plugins/common/libs/image/libsvgplugin/BUILD.gn index 491fd538d..3801b0188 100644 --- a/plugins/common/libs/image/libsvgplugin/BUILD.gn +++ b/plugins/common/libs/image/libsvgplugin/BUILD.gn @@ -29,14 +29,12 @@ ohos_shared_library("svgplugin") { ] include_dirs = [ - "$graphic_subsystem/utils/color_manager/export", "$image_subsystem/plugins/manager/include", "$image_subsystem/plugins/manager/include/image", "$image_subsystem/plugins/manager/include/pluginbase", "$image_subsystem/plugins/common/libs/image/libsvgplugin/include", "$image_subsystem/interfaces/innerkits/include", "$image_subsystem/frameworks/innerkitsimpl/utils/include", - "$skia_root/skia", ] deps = [ diff --git a/plugins/common/libs/image/libwebpplugin/BUILD.gn b/plugins/common/libs/image/libwebpplugin/BUILD.gn index a937ce908..d692e6521 100644 --- a/plugins/common/libs/image/libwebpplugin/BUILD.gn +++ b/plugins/common/libs/image/libwebpplugin/BUILD.gn @@ -31,23 +31,11 @@ ohos_shared_library("webpplugin") { include_dirs = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/image_framework/plugins/manager/include/image", "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", "//foundation/multimedia/image_framework/plugins/common/libs/image/libwebpplugin/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//third_party/skia/third_party/externals/libwebp/src", - "$skia_root/skia/include/core", - "$skia_root/skia/include/encode", - "$skia_root/skia", - "$skia_root/skia/src/ports/skia_ohos", - "$skia_root/skia/src/ports", - "$skia_root/skia/src/images", - "//third_party/expat/lib", - "$skia_root/skia/include/private", - "//third_party/skia/third_party/externals/freetype/include/freetype", - "//foundation/graphic/graphic_2d/utils/color_manager/export", ] if (use_mingw_win) { defines = image_decode_windows_defines @@ -61,7 +49,6 @@ ohos_shared_library("webpplugin") { } else { defines = [ "DUAL_ADAPTER" ] DUAL_ADAPTER = true - include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ "${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils", @@ -79,6 +66,7 @@ ohos_shared_library("webpplugin") { "graphic_2d:color_manager", "graphic_surface:surface", "hilog:libhilog", + "skia:libwebp", ] } diff --git a/plugins/common/libs/image/libwebpplugin/include/webp_encoder.h b/plugins/common/libs/image/libwebpplugin/include/webp_encoder.h index 5f76fa365..88ed15214 100644 --- a/plugins/common/libs/image/libwebpplugin/include/webp_encoder.h +++ b/plugins/common/libs/image/libwebpplugin/include/webp_encoder.h @@ -19,8 +19,7 @@ #include "plugin_class_base.h" #include "webp/encode.h" #include "src/images/SkImageEncoderFns.h" -#include "SkImageEncoderFns.h" -#include "SkStream.h" +#include "include/core/SkStream.h" namespace OHOS { namespace ImagePlugin { class WebpEncoder : public AbsImageEncoder, public OHOS::MultimediaPlugin::PluginClassBase { diff --git a/plugins/cross/image_native_android.gni b/plugins/cross/image_native_android.gni index d4de21183..371c6b3c5 100644 --- a/plugins/cross/image_native_android.gni +++ b/plugins/cross/image_native_android.gni @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") image_native_android_cflags = [ diff --git a/plugins/cross/image_native_ios.gni b/plugins/cross/image_native_ios.gni index b199e440e..d35ef95a1 100644 --- a/plugins/cross/image_native_ios.gni +++ b/plugins/cross/image_native_ios.gni @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") image_native_ios_cflags = [ diff --git a/plugins/manager/BUILD.gn b/plugins/manager/BUILD.gn index 9831edd21..3cf6cdf5c 100644 --- a/plugins/manager/BUILD.gn +++ b/plugins/manager/BUILD.gn @@ -109,9 +109,6 @@ if (use_clang_ios) { "//foundation/multimedia/image_framework/plugins/manager/src/thirdpartyadp/gstreamer", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//foundation/multimedia/utils/include", - "//third_party/json/single_include/nlohmann", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "$image_subsystem/mock/native/include/log", ] @@ -138,14 +135,13 @@ if (use_clang_ios) { "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] } else { - include_dirs += [ "//commonlibrary/c_utils/base/include" ] - ldflags = [ "-Wl,-Bsymbolic" ] external_deps = [ "c_utils:utils", "graphic_2d:color_manager", "hilog:libhilog", + "json:nlohmann_json_static", ] } @@ -182,11 +178,8 @@ ohos_static_library("pluginmanager_static") { "//foundation/multimedia/image_framework/plugins/manager/src/framework", "//foundation/multimedia/image_framework/plugins/manager/src/pluginbase", "//foundation/multimedia/image_framework/plugins/manager/src/thirdpartyadp/gstreamer", - "//foundation/multimedia/utils/include", "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//third_party/json/single_include/nlohmann", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] if (use_mingw_win) { @@ -221,14 +214,13 @@ ohos_static_library("pluginmanager_static") { "//commonlibrary/c_utils/base:utils", ] } else { - include_dirs += [ "//commonlibrary/c_utils/base/include" ] - ldflags = [ "-Wl,-Bsymbolic" ] external_deps = [ "c_utils:utils", "graphic_2d:color_manager", "hilog:libhilog", + "json:nlohmann_json_static", ] } subsystem_name = "multimedia"