diff --git a/plugins/common/libs/image/libextplugin/BUILD.gn b/plugins/common/libs/image/libextplugin/BUILD.gn index 318a8fcfb197f24442a0e2b45d6d8f09ad99a084..f3eecc22b422f60ca0afa16c0b3771d81fd13a80 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 8a2b1d7a9389d34b1717f65869b242d914fd9163..d9e72a03799c24c53faf4870c4ad8b0312635f1d 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" ]