diff --git a/ide/image_decode_config.gni b/ide/image_decode_config.gni index 3d196967133b33f0b8dafac7cd10827f86bc6bc7..b3b2b7b19f78a8ea4a5a94f23e9820926cceb1ac 100644 --- a/ide/image_decode_config.gni +++ b/ide/image_decode_config.gni @@ -57,6 +57,9 @@ resource_management_subsystem = graphic_surface_root = "//foundation/graphic/graphic_surface" use_new_skia_temp = false +if (use_clang_ios || use_clang_android) { + use_new_skia_temp = use_new_skia +} skia_root = "//third_party" skia_deps_root = skia_root diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 091c5ba9ea1303846109a64f55cf756450741bfa..10bda597cdf2679903fb37dd437b3ed1d6872625 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -56,8 +56,14 @@ config("image_external_config") { include_dirs += [ "//foundation/graphic/graphic_2d/utils/color_manager/export", "//commonlibrary/c_utils/base/include", - "//third_party/skia", + "$third_party_skia_root", ] + if (use_new_skia) { + defines = [ "USE_M133_SKIA" ] + print("use new skia___") + } else { + print("use old skia____") + } } if (use_mingw_win) { @@ -95,6 +101,9 @@ if (use_clang_android) { configs = [ ":image_postproc_config" ] defines = image_decode_android_defines defines += [ "CROSS_PLATFORM" ] + if (use_new_skia) { + defines += [ "USE_M133_SKIA" ] + } cflags = image_native_android_cflags sources = image_native_android_sources include_dirs = image_native_android_include_dirs @@ -109,6 +118,9 @@ if (use_clang_android) { configs = [ ":image_postproc_config" ] defines = image_decode_ios_defines defines += [ "CROSS_PLATFORM" ] + if (use_new_skia) { + defines += [ "USE_M133_SKIA" ] + } cflags = image_native_ios_cflags include_dirs = image_native_ios_include_dirs sources = image_native_ios_sources @@ -420,6 +432,9 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] + public_deps = [ + "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", + ] external_deps = [] } else if (use_clang_android) { defines = image_decode_android_defines @@ -438,6 +453,9 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] + public_deps = [ + "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", + ] external_deps = [] } else { defines = [ diff --git a/plugins/cross/image_native_android.gni b/plugins/cross/image_native_android.gni index 19545b06194f15744cc48c82bf487d88dd4a0bbe..c72ce36b80edea55c43639eab185cb8b47f45590 100644 --- a/plugins/cross/image_native_android.gni +++ b/plugins/cross/image_native_android.gni @@ -269,7 +269,7 @@ image_native_android_deps = [ "${image_subsystem}/plugins/common/libs/image/libextplugin:heifparser", # raw - "$third_party_skia_root/third_party/piex", + # "$third_party_skia_root/third_party/piex", # formatagent # png @@ -278,7 +278,7 @@ image_native_android_deps = [ if (use_new_skia_temp) { image_native_android_deps += [ "${third_party_skia_root}/third_party/libjpeg-turbo:libjpegm133", - "${third_party_skia_root}/third_party/libpng:libpngm133", + "${third_party_skia_root}/third_party/libpng:libpng", "${third_party_skia_root}/third_party/piex:piexm133", ] } else { diff --git a/plugins/cross/image_native_ios.gni b/plugins/cross/image_native_ios.gni index 6c2b0bafdd3a9cb45bd4c9a716a00739ac424830..c09c93521199bad710c54dc9b5006f52bc0a5bed 100644 --- a/plugins/cross/image_native_ios.gni +++ b/plugins/cross/image_native_ios.gni @@ -267,7 +267,7 @@ image_native_ios_deps = [ if (use_new_skia_temp) { image_native_ios_deps += [ "${third_party_skia_root}/third_party/libjpeg-turbo:libjpegm133", - "${third_party_skia_root}/third_party/libpng:libpngm133", + "${third_party_skia_root}/third_party/libpng:libpng", "${third_party_skia_root}/third_party/piex:piexm133", ] } else {