diff --git a/cgmanifest.json b/cgmanifest.json index 154afd3b4a7..9b914e05837 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -231,7 +231,7 @@ } }, "chrome_milestone": 150, - "upstream_merge_commit": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0" + "upstream_merge_commit": "cebbc418885bf2d928b31fb3798da45cd31d4a7b" } ] } diff --git a/externals/skia b/externals/skia index 280ec21adad..cebbc418885 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 280ec21adad7b21bdf8d8081a44c3191bb420fc3 +Subproject commit cebbc418885bf2d928b31fb3798da45cd31d4a7b diff --git a/native/android/build.cake b/native/android/build.cake index 6ed6b3f636c..4a589485dc9 100644 --- a/native/android/build.cake +++ b/native/android/build.cake @@ -25,6 +25,7 @@ Task("libSkiaSharp") $"target_os='android' " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_freetype2=false " + diff --git a/native/ios/build.cake b/native/ios/build.cake index b756a6c7efe..2704d303f66 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -55,6 +55,7 @@ Task("libSkiaSharp") $"ios_use_simulator={(isSim ? "true" : "false")} " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_metal=true " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + diff --git a/native/linux/build.cake b/native/linux/build.cake index 5089f88b8a2..e6800fa2596 100644 --- a/native/linux/build.cake +++ b/native/linux/build.cake @@ -106,6 +106,7 @@ Task("libSkiaSharp") $"skia_enable_ganesh={(SUPPORT_GPU ? "true" : "false")} " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_freetype2=false " + @@ -153,6 +154,7 @@ Task("libHarfBuzzSharp") $"target_os='linux' " + $"target_cpu='{skiaArch}' " + $"visibility_hidden=false " + + $"skia_use_partition_alloc=false " + $"extra_asmflags=[] " + $"extra_cflags=[ '-stdlib=libc++'{bionicDefineHB} ] " + $"extra_ldflags=[ '-stdlib=libc++', '-static-libgcc'{staticLibcxxHB}, '-Wl,--version-script={map}' ] " + diff --git a/native/macos/build.cake b/native/macos/build.cake index daed3247bc8..b4b495c4ae9 100644 --- a/native/macos/build.cake +++ b/native/macos/build.cake @@ -32,6 +32,7 @@ Task("libSkiaSharp") $"min_macos_version='{GetDeploymentTarget(arch)}' " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_metal=true " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + diff --git a/native/tizen/build.cake b/native/tizen/build.cake index 7f3523b0912..0ea33ff8217 100644 --- a/native/tizen/build.cake +++ b/native/tizen/build.cake @@ -44,6 +44,7 @@ Task("libSkiaSharp") $"skia_enable_ganesh=true " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_freetype2=true " + diff --git a/native/tvos/build.cake b/native/tvos/build.cake index c0baac47330..a6d9b1f2a8b 100644 --- a/native/tvos/build.cake +++ b/native/tvos/build.cake @@ -39,6 +39,7 @@ Task("libSkiaSharp") $"ios_use_simulator={(isSim ? "true" : "false")} " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_metal=true " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + diff --git a/native/wasm/build.cake b/native/wasm/build.cake index 4db215e10ed..2190d21c973 100644 --- a/native/wasm/build.cake +++ b/native/wasm/build.cake @@ -46,6 +46,7 @@ Task("libSkiaSharp") $"skia_use_freetype=true " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=false " + $"skia_use_expat=true " + $"skia_use_libwebp_encode=true " + @@ -125,6 +126,7 @@ Task("libHarfBuzzSharp") $"target_os='linux' " + $"target_cpu='wasm' " + $"is_static_skiasharp=true " + + $"skia_use_partition_alloc=false " + $"extra_cflags=[ '-s', 'WARN_UNALIGNED=1' { (hasSimdEnabled ? ", '-msimd128'" : "") } { (hasThreadingEnabled ? ", '-pthread'" : "") } { (hasWasmEH ? ", '-fwasm-exceptions'" : "") } ] " + $"extra_cflags_cc=[ '-frtti' { (hasSimdEnabled ? ", '-msimd128'" : "") } { (hasThreadingEnabled ? ", '-pthread'" : "") } { (hasWasmEH ? ", '-fwasm-exceptions'" : "") } ] " + $"skia_emsdk_dir='{EMSCRIPTEN_ROOT}'" + diff --git a/native/windows/build.cake b/native/windows/build.cake index 0db55436e43..878a68208e3 100644 --- a/native/windows/build.cake +++ b/native/windows/build.cake @@ -50,6 +50,7 @@ Task("libSkiaSharp") $"skia_use_dng_sdk=true " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_libjpeg_turbo=false " +