From e42ca4815b93a9530632ef67bb50b2ed01057e56 Mon Sep 17 00:00:00 2001 From: sunfei Date: Sat, 18 Sep 2021 17:51:54 +0800 Subject: [PATCH] Merge code to master Signed-off-by: sunfei Change-Id: I0c98c3a68139e4a2f6bb1cc505fa2e58e3613233 --- .../innerkitsimpl/pixelconverter/BUILD.gn | 85 ++----------------- .../common/libs/image/libwebpplugin/BUILD.gn | 18 +--- 2 files changed, 7 insertions(+), 96 deletions(-) diff --git a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn index 9f5bf5b23..4a5b35985 100644 --- a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn +++ b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn @@ -92,55 +92,21 @@ ohos_shared_library("pixelconvertadapter") { defines = image_decode_windows_defines deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_windows", "//foundation/communication/ipc/utils/include", "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//third_party/flutter:ace_fontmgr_windows", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", "//utils/jni:utils_jnikit_win", ] } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_mac", "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//third_party/flutter:ace_fontmgr_mac", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_skia_opts", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", ] } else { deps = [ + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_ohos", "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//third_party/flutter:ace_fontconfig.json", - "//third_party/flutter:ace_fontmgr_ohos", - "//third_party/flutter:ace_fontmgr_standard", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_jsoncpp", - "//third_party/flutter:ace_libfreetype2", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libsfntly_ohos", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_skia_opts", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", "//utils/native/base:utils", ] @@ -159,58 +125,19 @@ ohos_static_library("pixelconvertadapter_static") { if (use_mingw_win) { defines = image_decode_windows_defines deps = [ + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_windows", "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//third_party/flutter:ace_fontmgr_windows", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_libfreetype2", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_skia_opts", - "//third_party/flutter:ace_skia_windows", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", ] } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_mac", "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//third_party/flutter:ace_fontmgr_mac", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_libfreetype2", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_skia_mac", - "//third_party/flutter:ace_skia_opts", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", ] } else { deps = [ + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_ohos", "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//third_party/flutter:ace_fontconfig.json", - "//third_party/flutter:ace_fontmgr_ohos", - "//third_party/flutter:ace_fontmgr_standard", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_jsoncpp", - "//third_party/flutter:ace_libfreetype2", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_skia_ohos", - "//third_party/flutter:ace_skia_opts", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", "//utils/native/base:utils", ] diff --git a/plugins/common/libs/image/libwebpplugin/BUILD.gn b/plugins/common/libs/image/libwebpplugin/BUILD.gn index c5634875a..7e4697e6f 100644 --- a/plugins/common/libs/image/libwebpplugin/BUILD.gn +++ b/plugins/common/libs/image/libwebpplugin/BUILD.gn @@ -54,24 +54,8 @@ ohos_shared_library("webpplugin") { include_dirs += [ "//utils/native/base/include" ] deps = [ + "//foundation/ace/ace_engine/build/third_party/flutter/skia:ace_skia_ohos", "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", - "//third_party/flutter:ace_fontconfig.json", - "//third_party/flutter:ace_fontmgr_ohos", - "//third_party/flutter:ace_fontmgr_standard", - "//third_party/flutter:ace_jpeg", - "//third_party/flutter:ace_jsoncpp", - "//third_party/flutter:ace_libfreetype2", - "//third_party/flutter:ace_libjpeg", - "//third_party/flutter:ace_libpng", - "//third_party/flutter:ace_libwebp", - "//third_party/flutter:ace_png", - "//third_party/flutter:ace_skcms", - "//third_party/flutter:ace_skia_core", - "//third_party/flutter:ace_skia_ohos", - "//third_party/flutter:ace_skia_opts", - "//third_party/flutter:ace_typeface_freetype", - "//third_party/flutter:ace_webp", - "//utils/native/base:utils", "//utils/native/base:utils", ] -- Gitee