From e49f5ec2277dc3e9dbecf6c08c74f3ae8d95cc6c Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 2 Jul 2025 08:45:35 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8declare=5Fargs=E9=87=8C=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=96=B0=E7=89=88skia=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Change-Id: Ia148d75c8db8dcd2c6f34fe3c2f0745ca50c51d2 --- build_overrides/skia.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_overrides/skia.gni b/build_overrides/skia.gni index a37cd35417..adf0b1fce4 100644 --- a/build_overrides/skia.gni +++ b/build_overrides/skia.gni @@ -13,7 +13,7 @@ import("//build/ohos_var.gni") declare_args() { - skia_feature_upgrade = false + skia_feature_upgrade = true } if (skia_feature_upgrade) { -- Gitee From ce5d762c21a544e48099d91e2dd0fa4a3dc78d3d Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 3 Jul 2025 10:50:00 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=87=BA=E5=8A=A8=E6=80=81=E5=BA=93libskia=5Fcanvaski?= =?UTF-8?q?t.z.so=E6=96=87=E4=BB=B6=E7=9A=84=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Change-Id: I14d3eed92db6f7a71e713fbbeeb49470abb9aa73 --- BUILD.gn | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 1cc9ddf242..11ecc776ba 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -4642,7 +4642,24 @@ ohos_static_library("sksl_ext_static") { defines = skia_common_defines cflags = skia_common_cflags - cflags += [ "-Wno-ignored-attributes" ] + cflags += [ + "-Wno-ignored-attributes", + "-ffunction-sections", + "-fdata-sections", + "-fvisibility=hidden", + "-fno-unwind-tables", + "-fno-asynchronous-unwind-tables", + ] + + cflags_cc = [ + "-fvisibility-inlines-hidden", + "-fno-rtti", + ] + + ldflags = [ + "-Wl,--gc-sections", + "-Wl,--icf=all", + ] if (skia_build_for_debugger) { defines += [ "SK_BUILD_FOR_DEBUGGER" ] -- Gitee From 29ad1467821473f90c7d47e832212387c5892f78 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 3 Jul 2025 12:26:17 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9ldflags=20icf=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=B8=BAsafe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Change-Id: I07128273bbd8aa2fa71a3c19644b8065797b2f60 --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 11ecc776ba..ba65b4adf8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -4658,7 +4658,7 @@ ohos_static_library("sksl_ext_static") { ldflags = [ "-Wl,--gc-sections", - "-Wl,--icf=all", + "-Wl,--icf=safe", ] if (skia_build_for_debugger) { -- Gitee