external/skia/Library_skia.mk |  989 +++++++++++++++++++++++++-----------------
 external/skia/README          |    3 
 2 files changed, 600 insertions(+), 392 deletions(-)

New commits:
commit 19566380abbb936104076ae42d34f2075a89dc65
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Oct 4 13:31:00 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Oct 5 08:41:16 2024 +0200

    Re-organise the skia makefile
    
    so it more closely corresponds to the GN buildfiles that it is derived
    from, in order to make updating to newer versions of skia easier
    
    Change-Id: Iffd934d0bb05f4abe2b97838eb18baccac4a5096
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174474
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 9d240e40da0c..a12d339ba7a9 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -139,10 +139,188 @@ $(eval $(call gb_Library_add_exception_objects,skia,\
 
 $(eval $(call gb_Library_set_generated_cxx_suffix,skia,cpp))
 
+# from file skia/gn/BUILD.gn:416, target "optional("fontmgr_fontconfig")"
+#
+ifneq ($(filter-out WNT MACOSX,$(OS)),)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig \
+))
+endif
+
+# from file skia/gn/BUILD.gn:426, target 
"optional("fontmgr_fontconfig_factory")"
+#
+ifneq ($(filter-out WNT MACOSX,$(OS)),)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig_factory \
+))
+endif
+
+# from file skia/gn/BUILD.gn:432, target 
"optional("fontmgr_FontConfigInterface")"
+#
+ifneq ($(filter-out WNT MACOSX,$(OS)),)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontConfigInterface \
+    UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct \
+    UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct_factory \
+    UnpackedTarball/skia/src/ports/SkFontMgr_FontConfigInterface \
+))
+endif
+
+# from file skia/gn/BUILD.gn:472, target "optional("fontmgr_mac_ct")"
+#
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct \
+    UnpackedTarball/skia/src/ports/SkScalerContext_mac_ct \
+    UnpackedTarball/skia/src/ports/SkTypeface_mac_ct \
+))
+endif
+
+# from file skia/gn/BUILD.gn:508, target "optional("fontmgr_mac_ct_factory")"
+#
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct_factory \
+))
+endif
+
+# from file skia/gn/BUILD.gn:514, target "optional("fontmgr_win")"
+#
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/fonts/SkFontMgr_indirect \
+    UnpackedTarball/skia/src/ports/SkFontMgr_win_dw \
+    UnpackedTarball/skia/src/ports/SkScalerContext_win_dw \
+    UnpackedTarball/skia/src/ports/SkTypeface_win_dw \
+))
+endif
+
+# from file skia/gn/BUILD.gn:530, target "optional("fontmgr_win_factory")"
+#
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontMgr_win_dw_factory \
+))
+endif
+
+# from file skia/gn/BUILD.gn:536, target "optional("fontmgr_win_gdi")"
+#
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontHost_win \
+))
+endif
+
+# from file skia/gn/BUILD.gn:1278, target "optional("png_decode")"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/codec/SkIcoCodec \
+    UnpackedTarball/skia/src/codec/SkPngCodec \
+))
+
+# from file skia/gn/BUILD.gn:1314, target "typeface_freetype"
+#
+ifneq ($(filter-out WNT MACOSX,$(OS)),)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkFontHost_FreeType \
+    UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common \
+))
+endif
+
+# from file skia/gn/BUILD.gn:1400, target "skia_component("skia")"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/codec/SkAndroidCodec \
+    UnpackedTarball/skia/src/codec/SkAndroidCodecAdapter \
+    UnpackedTarball/skia/src/codec/SkEncodedInfo \
+    UnpackedTarball/skia/src/codec/SkParseEncodedOrigin \
+    UnpackedTarball/skia/src/codec/SkSampledCodec \
+    UnpackedTarball/skia/src/ports/SkGlobalInitialization_default \
+    UnpackedTarball/skia/src/ports/SkOSFile_stdio \
+    UnpackedTarball/skia/src/sfnt/SkOTTable_name \
+    UnpackedTarball/skia/src/sfnt/SkOTUtils \
+))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkDebug_win \
+    UnpackedTarball/skia/src/ports/SkOSFile_win \
+    UnpackedTarball/skia/src/ports/SkOSLibrary_win \
+))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkDebug_stdio \
+    UnpackedTarball/skia/src/ports/SkImageGeneratorCG \
+    UnpackedTarball/skia/src/ports/SkOSFile_posix \
+    UnpackedTarball/skia/src/ports/SkOSLibrary_posix \
+))
+else
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/ports/SkDebug_stdio \
+    UnpackedTarball/skia/src/ports/SkOSFile_posix \
+    UnpackedTarball/skia/src/ports/SkOSLibrary_posix \
+))
+endif
+
+
+# from file skia/gn/BUILD.gn:1903, target "test_lib("gpu_tool_utils")"
+#
+ifeq ($(SKIA_GPU),VULKAN)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
+))
+endif
+
+# from file skia/BUILD.gn:2719, target "test_lib("sk_app")"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/tools/sk_app/WindowContext \
+       $(if $(filter 
LINUX,$(OS)),UnpackedTarball/skia/tools/sk_app/unix/RasterWindowContext_unix) \
+    $(if $(filter 
WNT,$(OS)),UnpackedTarball/skia/tools/sk_app/win/RasterWindowContext_win) \
+))
+ifeq ($(SKIA_GPU),VULKAN)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+       UnpackedTarball/skia/tools/sk_app/VulkanWindowContext \
+       $(if $(filter 
LINUX,$(OS)),UnpackedTarball/skia/tools/sk_app/unix/VulkanWindowContext_unix) \
+    $(if $(filter 
WNT,$(OS)),UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win) \
+))
+endif
+ifeq ($(SKIA_GPU),METAL)
+$(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
+    UnpackedTarball/skia/tools/sk_app/MetalWindowContext \
+    $(if $(filter 
MACOSX,$(OS)),UnpackedTarball/skia/tools/sk_app/mac/MetalWindowContext_mac) \
+))
+endif
+
+# from file skia/gn/codec.gni, target "skia_codec_core"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/codec/SkCodec \
+    UnpackedTarball/skia/src/codec/SkCodecImageGenerator \
+    UnpackedTarball/skia/src/codec/SkColorPalette \
+    UnpackedTarball/skia/src/codec/SkMasks \
+    UnpackedTarball/skia/src/codec/SkMaskSwizzler \
+    UnpackedTarball/skia/src/codec/SkPixmapUtils \
+    UnpackedTarball/skia/src/codec/SkSampler \
+    UnpackedTarball/skia/src/codec/SkSwizzler \
+))
+
+# from file skia/gn/codec.gni, target "skia_codec_decode_bmp"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/codec/SkBmpBaseCodec \
+    UnpackedTarball/skia/src/codec/SkBmpCodec \
+    UnpackedTarball/skia/src/codec/SkBmpMaskCodec \
+    UnpackedTarball/skia/src/codec/SkBmpRLECodec \
+    UnpackedTarball/skia/src/codec/SkBmpStandardCodec \
+    UnpackedTarball/skia/src/codec/SkWbmpCodec \
+))
+
+# from file skia/gn/core.gni:152, target "skia_core_sources"
+#
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/base/SkArenaAlloc \
     UnpackedTarball/skia/src/base/SkBezierCurves \
-    UnpackedTarball/skia/src/base/SkBlockAllocator \
+       UnpackedTarball/skia/src/base/SkBlockAllocator \
     UnpackedTarball/skia/src/base/SkBuffer \
     UnpackedTarball/skia/src/base/SkContainers \
     UnpackedTarball/skia/src/base/SkCubics \
@@ -157,57 +335,35 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/base/SkSharedMutex \
     UnpackedTarball/skia/src/base/SkSpinlock \
     UnpackedTarball/skia/src/base/SkTDArray \
-    UnpackedTarball/skia/src/base/SkThreadID \
     UnpackedTarball/skia/src/base/SkTSearch \
-    UnpackedTarball/skia/src/base/SkUtils \
+    UnpackedTarball/skia/src/base/SkThreadID \
     UnpackedTarball/skia/src/base/SkUTF \
-    UnpackedTarball/skia/src/codec/SkAndroidCodecAdapter \
-    UnpackedTarball/skia/src/codec/SkAndroidCodec \
-    UnpackedTarball/skia/src/codec/SkBmpBaseCodec \
-    UnpackedTarball/skia/src/codec/SkBmpCodec \
-    UnpackedTarball/skia/src/codec/SkBmpMaskCodec \
-    UnpackedTarball/skia/src/codec/SkBmpRLECodec \
-    UnpackedTarball/skia/src/codec/SkBmpStandardCodec \
-    UnpackedTarball/skia/src/codec/SkCodec \
-    UnpackedTarball/skia/src/codec/SkCodecImageGenerator \
-    UnpackedTarball/skia/src/codec/SkColorPalette \
-    UnpackedTarball/skia/src/codec/SkEncodedInfo \
-    UnpackedTarball/skia/src/codec/SkIcoCodec \
-    UnpackedTarball/skia/src/codec/SkMasks \
-    UnpackedTarball/skia/src/codec/SkMaskSwizzler \
-    UnpackedTarball/skia/src/codec/SkParseEncodedOrigin \
-    UnpackedTarball/skia/src/codec/SkPixmapUtils \
-    UnpackedTarball/skia/src/codec/SkPngCodec \
-    UnpackedTarball/skia/src/codec/SkSampledCodec \
-    UnpackedTarball/skia/src/codec/SkSampler \
-    UnpackedTarball/skia/src/codec/SkSwizzler \
-    UnpackedTarball/skia/src/codec/SkWbmpCodec \
+    UnpackedTarball/skia/src/base/SkUtils \
     UnpackedTarball/skia/src/core/SkAAClip \
+    UnpackedTarball/skia/src/core/SkATrace \
     UnpackedTarball/skia/src/core/SkAlphaRuns \
     UnpackedTarball/skia/src/core/SkAnalyticEdge \
     UnpackedTarball/skia/src/core/SkAnnotation \
-    UnpackedTarball/skia/src/core/SkATrace \
     UnpackedTarball/skia/src/core/SkAutoPixmapStorage \
     UnpackedTarball/skia/src/core/SkBBHFactory \
-    UnpackedTarball/skia/src/core/SkBigPicture \
-    UnpackedTarball/skia/src/core/SkBitmapCache \
     UnpackedTarball/skia/src/core/SkBitmap \
+    UnpackedTarball/skia/src/core/SkBitmapCache \
     UnpackedTarball/skia/src/core/SkBitmapDevice \
     UnpackedTarball/skia/src/core/SkBitmapProcState \
     UnpackedTarball/skia/src/core/SkBitmapProcState_matrixProcs \
     UnpackedTarball/skia/src/core/SkBlendMode \
     UnpackedTarball/skia/src/core/SkBlendModeBlender \
     UnpackedTarball/skia/src/core/SkBlitRow_D32 \
-    UnpackedTarball/skia/src/core/SkBlitter_ARGB32 \
-    UnpackedTarball/skia/src/core/SkBlitter_A8 \
     UnpackedTarball/skia/src/core/SkBlitter \
+    UnpackedTarball/skia/src/core/SkBlitter_A8 \
+    UnpackedTarball/skia/src/core/SkBlitter_ARGB32 \
     UnpackedTarball/skia/src/core/SkBlitter_Sprite \
     UnpackedTarball/skia/src/core/SkBlurMask \
     UnpackedTarball/skia/src/core/SkBlurMaskFilterImpl \
     UnpackedTarball/skia/src/core/SkCachedData \
     UnpackedTarball/skia/src/core/SkCanvas \
-    UnpackedTarball/skia/src/core/SkCanvas_Raster \
     UnpackedTarball/skia/src/core/SkCanvasPriv \
+    UnpackedTarball/skia/src/core/SkCanvas_Raster \
     UnpackedTarball/skia/src/core/SkCapabilities \
     UnpackedTarball/skia/src/core/SkChecksum \
     UnpackedTarball/skia/src/core/SkChromeRemoteGlyphCache \
@@ -231,7 +387,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkDevice \
     UnpackedTarball/skia/src/core/SkDistanceFieldGen \
     UnpackedTarball/skia/src/core/SkDocument \
-    UnpackedTarball/skia/src/core/SkDrawable \
     UnpackedTarball/skia/src/core/SkDraw \
     UnpackedTarball/skia/src/core/SkDrawBase \
     UnpackedTarball/skia/src/core/SkDrawLooper \
@@ -239,42 +394,44 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkDraw_atlas \
     UnpackedTarball/skia/src/core/SkDraw_text \
     UnpackedTarball/skia/src/core/SkDraw_vertices \
+    UnpackedTarball/skia/src/core/SkDrawable \
+    UnpackedTarball/skia/src/core/SkEdge \
     UnpackedTarball/skia/src/core/SkEdgeBuilder \
     UnpackedTarball/skia/src/core/SkEdgeClipper \
-    UnpackedTarball/skia/src/core/SkEdge \
     UnpackedTarball/skia/src/core/SkExecutor \
     UnpackedTarball/skia/src/core/SkFlattenable \
     UnpackedTarball/skia/src/core/SkFont \
-    UnpackedTarball/skia/src/core/SkFont_serial \
     UnpackedTarball/skia/src/core/SkFontDescriptor \
     UnpackedTarball/skia/src/core/SkFontMetricsPriv \
     UnpackedTarball/skia/src/core/SkFontMgr \
     UnpackedTarball/skia/src/core/SkFontStream \
+    UnpackedTarball/skia/src/core/SkFont_serial \
     UnpackedTarball/skia/src/core/SkGaussFilter \
     UnpackedTarball/skia/src/core/SkGeometry \
-    UnpackedTarball/skia/src/core/SkIDChangeListener \
     UnpackedTarball/skia/src/core/SkGlobalInitialization_core \
     UnpackedTarball/skia/src/core/SkGlyph \
     UnpackedTarball/skia/src/core/SkGlyphRunPainter \
+    $(if $(SKIA_GPU),UnpackedTarball/skia/src/core/SkGpuBlurUtils) \
     UnpackedTarball/skia/src/core/SkGraphics \
+    UnpackedTarball/skia/src/core/SkIDChangeListener \
+    UnpackedTarball/skia/src/core/SkImageFilter \
     UnpackedTarball/skia/src/core/SkImageFilterCache \
     UnpackedTarball/skia/src/core/SkImageFilterTypes \
-    UnpackedTarball/skia/src/core/SkImageFilter \
     UnpackedTarball/skia/src/core/SkImageGenerator \
     UnpackedTarball/skia/src/core/SkImageInfo \
     UnpackedTarball/skia/src/core/SkLatticeIter \
     UnpackedTarball/skia/src/core/SkLineClipper \
     UnpackedTarball/skia/src/core/SkLocalMatrixImageFilter \
+    UnpackedTarball/skia/src/core/SkM44 \
+    UnpackedTarball/skia/src/core/SkMD5 \
     UnpackedTarball/skia/src/core/SkMallocPixelRef \
+    UnpackedTarball/skia/src/core/SkMask \
     UnpackedTarball/skia/src/core/SkMaskBlurFilter \
     UnpackedTarball/skia/src/core/SkMaskCache \
-    UnpackedTarball/skia/src/core/SkMask \
     UnpackedTarball/skia/src/core/SkMaskFilter \
     UnpackedTarball/skia/src/core/SkMaskGamma \
     UnpackedTarball/skia/src/core/SkMatrix \
     UnpackedTarball/skia/src/core/SkMatrixInvert \
-    UnpackedTarball/skia/src/core/SkM44 \
-    UnpackedTarball/skia/src/core/SkMD5 \
     UnpackedTarball/skia/src/core/SkMesh \
     UnpackedTarball/skia/src/core/SkMipmap \
     UnpackedTarball/skia/src/core/SkMipmapAccessor \
@@ -291,12 +448,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkPathRef \
     UnpackedTarball/skia/src/core/SkPathUtils \
     UnpackedTarball/skia/src/core/SkPath_serial \
-    UnpackedTarball/skia/src/core/SkPicture \
-    UnpackedTarball/skia/src/core/SkPictureData \
-    UnpackedTarball/skia/src/core/SkPictureFlat \
-    UnpackedTarball/skia/src/core/SkPicturePlayback \
-    UnpackedTarball/skia/src/core/SkPictureRecord \
-    UnpackedTarball/skia/src/core/SkPictureRecorder \
     UnpackedTarball/skia/src/core/SkPixelRef \
     UnpackedTarball/skia/src/core/SkPixmap \
     UnpackedTarball/skia/src/core/SkPixmapDraw \
@@ -304,36 +455,34 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkPoint3 \
     UnpackedTarball/skia/src/core/SkPtrRecorder \
     UnpackedTarball/skia/src/core/SkQuadClipper \
+    UnpackedTarball/skia/src/core/SkRRect \
+    UnpackedTarball/skia/src/core/SkRSXform \
+    UnpackedTarball/skia/src/core/SkRTree \
     UnpackedTarball/skia/src/core/SkRasterClip \
-    UnpackedTarball/skia/src/core/SkRasterPipelineBlitter \
     UnpackedTarball/skia/src/core/SkRasterPipeline \
+    UnpackedTarball/skia/src/core/SkRasterPipelineBlitter \
     UnpackedTarball/skia/src/core/SkReadBuffer \
-    UnpackedTarball/skia/src/core/SkRecord \
     UnpackedTarball/skia/src/core/SkReadPixelsRec \
+    UnpackedTarball/skia/src/core/SkRecord \
     UnpackedTarball/skia/src/core/SkRecordDraw \
-    UnpackedTarball/skia/src/core/SkRecordedDrawable \
-    UnpackedTarball/skia/src/core/SkRecorder \
     UnpackedTarball/skia/src/core/SkRecordOpts \
     UnpackedTarball/skia/src/core/SkRecords \
     UnpackedTarball/skia/src/core/SkRect \
     UnpackedTarball/skia/src/core/SkRegion \
     UnpackedTarball/skia/src/core/SkRegion_path \
     UnpackedTarball/skia/src/core/SkResourceCache \
-    UnpackedTarball/skia/src/core/SkRRect \
-    UnpackedTarball/skia/src/core/SkRSXform \
-    UnpackedTarball/skia/src/core/SkRTree \
     UnpackedTarball/skia/src/core/SkRuntimeBlender \
     UnpackedTarball/skia/src/core/SkRuntimeEffect \
+    UnpackedTarball/skia/src/core/SkSLTypeShared \
     UnpackedTarball/skia/src/core/SkScalar \
     UnpackedTarball/skia/src/core/SkScalerContext \
+    UnpackedTarball/skia/src/core/SkScan \
     UnpackedTarball/skia/src/core/SkScan_AAAPath \
-    UnpackedTarball/skia/src/core/SkScan_Antihair \
     UnpackedTarball/skia/src/core/SkScan_AntiPath \
-    UnpackedTarball/skia/src/core/SkScan \
+    UnpackedTarball/skia/src/core/SkScan_Antihair \
     UnpackedTarball/skia/src/core/SkScan_Hairline \
     UnpackedTarball/skia/src/core/SkScan_Path \
     UnpackedTarball/skia/src/core/SkScan_SAAPath \
-    UnpackedTarball/skia/src/core/SkSLTypeShared \
     UnpackedTarball/skia/src/core/SkSpecialImage \
     UnpackedTarball/skia/src/core/SkSpecialSurface \
     UnpackedTarball/skia/src/core/SkSpriteBlitter_ARGB32 \
@@ -351,14 +500,14 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkTextBlob \
     UnpackedTarball/skia/src/core/SkTextBlobTrace \
     UnpackedTarball/skia/src/core/SkTime \
-    UnpackedTarball/skia/src/core/SkTypefaceCache \
     UnpackedTarball/skia/src/core/SkTypeface \
+    UnpackedTarball/skia/src/core/SkTypefaceCache \
     UnpackedTarball/skia/src/core/SkTypeface_remote \
     UnpackedTarball/skia/src/core/SkUnPreMultiply \
-    UnpackedTarball/skia/src/core/SkVertices \
-    UnpackedTarball/skia/src/core/SkVertState \
     UnpackedTarball/skia/src/core/SkVM \
     UnpackedTarball/skia/src/core/SkVMBlitter \
+    UnpackedTarball/skia/src/core/SkVertState \
+    UnpackedTarball/skia/src/core/SkVertices \
     UnpackedTarball/skia/src/core/SkWriteBuffer \
     UnpackedTarball/skia/src/core/SkWritePixelsRec \
     UnpackedTarball/skia/src/core/SkWriter32 \
@@ -366,53 +515,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkYUVAPixmaps \
     UnpackedTarball/skia/src/core/SkYUVMath \
     UnpackedTarball/skia/src/core/SkYUVPlanesCache \
-    UnpackedTarball/skia/src/encode/SkICC \
-    UnpackedTarball/skia/src/encode/SkPngEncoderImpl \
-    UnpackedTarball/skia/src/encode/SkEncoder \
-    UnpackedTarball/skia/src/effects/colorfilters/SkBlendModeColorFilter \
-    UnpackedTarball/skia/src/effects/colorfilters/SkColorFilterBase \
-    UnpackedTarball/skia/src/effects/colorfilters/SkColorSpaceXformColorFilter 
\
-    UnpackedTarball/skia/src/effects/colorfilters/SkComposeColorFilter \
-    UnpackedTarball/skia/src/effects/colorfilters/SkGaussianColorFilter \
-    UnpackedTarball/skia/src/effects/colorfilters/SkMatrixColorFilter \
-    UnpackedTarball/skia/src/effects/colorfilters/SkRuntimeColorFilter \
-    UnpackedTarball/skia/src/effects/colorfilters/SkTableColorFilter \
-    UnpackedTarball/skia/src/effects/colorfilters/SkWorkingFormatColorFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkBlendImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkBlurImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkColorFilterImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkComposeImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkCropImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkDisplacementMapImageFilter 
\
-    UnpackedTarball/skia/src/effects/imagefilters/SkDropShadowImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkImageImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkLightingImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkMagnifierImageFilter \
-    
UnpackedTarball/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkMatrixTransformImageFilter 
\
-    UnpackedTarball/skia/src/effects/imagefilters/SkMergeImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkMorphologyImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkPictureImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkShaderImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkRuntimeImageFilter \
-    UnpackedTarball/skia/src/effects/imagefilters/SkTileImageFilter \
-    UnpackedTarball/skia/src/effects/SkBlenders \
-    UnpackedTarball/skia/src/effects/SkColorMatrix \
-    UnpackedTarball/skia/src/effects/SkColorMatrixFilter \
-    UnpackedTarball/skia/src/effects/SkCornerPathEffect \
-    UnpackedTarball/skia/src/effects/SkDashPathEffect \
-    UnpackedTarball/skia/src/effects/SkDiscretePathEffect \
-    UnpackedTarball/skia/src/effects/SkEmbossMask \
-    UnpackedTarball/skia/src/effects/SkEmbossMaskFilter \
-    UnpackedTarball/skia/src/effects/SkHighContrastFilter \
-    UnpackedTarball/skia/src/effects/SkLayerDrawLooper \
-    UnpackedTarball/skia/src/effects/SkOpPathEffect \
-    UnpackedTarball/skia/src/effects/SkShaderMaskFilterImpl \
-    UnpackedTarball/skia/src/effects/SkTableMaskFilter \
-    UnpackedTarball/skia/src/effects/SkTrimPathEffect \
-    UnpackedTarball/skia/src/effects/Sk1DPathEffect \
-    UnpackedTarball/skia/src/effects/Sk2DPathEffect \
-    UnpackedTarball/skia/src/fonts/SkRemotableFontMgr \
     UnpackedTarball/skia/src/image/SkImage \
     UnpackedTarball/skia/src/image/SkImage_Base \
     UnpackedTarball/skia/src/image/SkImage_Lazy \
@@ -428,6 +530,27 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/image/SkSurface_Raster \
     UnpackedTarball/skia/src/image/SkTiledImageUtils \
     UnpackedTarball/skia/src/lazy/SkDiscardableMemoryPool \
+    UnpackedTarball/skia/src/shaders/SkBitmapProcShader \
+    UnpackedTarball/skia/src/shaders/SkBlendShader \
+    UnpackedTarball/skia/src/shaders/SkColorFilterShader \
+    UnpackedTarball/skia/src/shaders/SkColorShader \
+    UnpackedTarball/skia/src/shaders/SkCoordClampShader \
+    UnpackedTarball/skia/src/shaders/SkEmptyShader \
+    UnpackedTarball/skia/src/shaders/SkImageShader \
+    UnpackedTarball/skia/src/shaders/SkLocalMatrixShader \
+    UnpackedTarball/skia/src/shaders/SkPerlinNoiseShaderImpl \
+    UnpackedTarball/skia/src/shaders/SkRuntimeShader \
+    UnpackedTarball/skia/src/shaders/SkShader \
+    UnpackedTarball/skia/src/shaders/SkShaderBase \
+    UnpackedTarball/skia/src/shaders/SkTransformShader \
+    UnpackedTarball/skia/src/shaders/SkTriColorShader \
+    UnpackedTarball/skia/src/text/GlyphRun \
+    UnpackedTarball/skia/src/text/StrikeForGPU \
+))
+
+# from file skia/gn/core.gni:667, target "skia_pathops_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/pathops/SkAddIntersections \
     UnpackedTarball/skia/src/pathops/SkDConicLineIntersection \
     UnpackedTarball/skia/src/pathops/SkDCubicLineIntersection \
@@ -454,34 +577,151 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/pathops/SkPathOpsQuad \
     UnpackedTarball/skia/src/pathops/SkPathOpsRect \
     UnpackedTarball/skia/src/pathops/SkPathOpsSimplify \
-    UnpackedTarball/skia/src/pathops/SkPathOpsTightBounds \
     UnpackedTarball/skia/src/pathops/SkPathOpsTSect \
+    UnpackedTarball/skia/src/pathops/SkPathOpsTightBounds \
     UnpackedTarball/skia/src/pathops/SkPathOpsTypes \
     UnpackedTarball/skia/src/pathops/SkPathOpsWinding \
     UnpackedTarball/skia/src/pathops/SkPathWriter \
     UnpackedTarball/skia/src/pathops/SkReduceOrder \
-    UnpackedTarball/skia/src/sfnt/SkOTTable_name \
-    UnpackedTarball/skia/src/sfnt/SkOTUtils \
+))
+
+# from file skia/gn/core.gni:736, target "skia_skpicture_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/core/SkBigPicture \
+    UnpackedTarball/skia/src/core/SkPicture \
+    UnpackedTarball/skia/src/core/SkPictureData \
+    UnpackedTarball/skia/src/core/SkPictureFlat \
+    UnpackedTarball/skia/src/core/SkPicturePlayback \
+    UnpackedTarball/skia/src/core/SkPictureRecord \
+    UnpackedTarball/skia/src/core/SkPictureRecorder \
+    UnpackedTarball/skia/src/core/SkRecordedDrawable \
+    UnpackedTarball/skia/src/core/SkRecorder \
+    UnpackedTarball/skia/src/shaders/SkPictureShader \
+))
+
+# from file skia/gn/core.gni:765, target "skia_encode_srcs"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/encode/SkEncoder \
+    UnpackedTarball/skia/src/encode/SkICC \
+))
+
+# from file skia/gn/core.gni:792, target "skia_encode_png_srcs"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/encode/SkPngEncoderImpl \
+))
+
+# from file skia/gn/effects.gni:44, target "skia_effects_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/effects/Sk1DPathEffect \
+    UnpackedTarball/skia/src/effects/Sk2DPathEffect \
+    UnpackedTarball/skia/src/effects/SkBlenders \
+    UnpackedTarball/skia/src/effects/SkColorMatrix \
+    UnpackedTarball/skia/src/effects/SkColorMatrixFilter \
+    UnpackedTarball/skia/src/effects/SkCornerPathEffect \
+    UnpackedTarball/skia/src/effects/SkDashPathEffect \
+    UnpackedTarball/skia/src/effects/SkDiscretePathEffect \
+    UnpackedTarball/skia/src/effects/SkEmbossMask \
+    UnpackedTarball/skia/src/effects/SkEmbossMaskFilter \
+    UnpackedTarball/skia/src/effects/SkHighContrastFilter \
+    UnpackedTarball/skia/src/effects/SkLayerDrawLooper \
+    UnpackedTarball/skia/src/effects/SkOpPathEffect \
+    UnpackedTarball/skia/src/effects/SkShaderMaskFilterImpl \
+    UnpackedTarball/skia/src/effects/SkTableMaskFilter \
+    UnpackedTarball/skia/src/effects/SkTrimPathEffect \
     UnpackedTarball/skia/src/shaders/gradients/SkConicalGradient \
     UnpackedTarball/skia/src/shaders/gradients/SkGradientBaseShader \
     UnpackedTarball/skia/src/shaders/gradients/SkLinearGradient \
     UnpackedTarball/skia/src/shaders/gradients/SkRadialGradient \
     UnpackedTarball/skia/src/shaders/gradients/SkSweepGradient \
-    UnpackedTarball/skia/src/shaders/SkBlendShader \
-    UnpackedTarball/skia/src/shaders/SkBitmapProcShader \
-    UnpackedTarball/skia/src/shaders/SkColorFilterShader \
-    UnpackedTarball/skia/src/shaders/SkColorShader \
-    UnpackedTarball/skia/src/shaders/SkCoordClampShader \
-    UnpackedTarball/skia/src/shaders/SkEmptyShader \
-    UnpackedTarball/skia/src/shaders/SkImageShader \
-    UnpackedTarball/skia/src/shaders/SkLocalMatrixShader \
-    UnpackedTarball/skia/src/shaders/SkPictureShader \
-    UnpackedTarball/skia/src/shaders/SkPerlinNoiseShaderImpl \
-    UnpackedTarball/skia/src/shaders/SkRuntimeShader \
-    UnpackedTarball/skia/src/shaders/SkShader \
-    UnpackedTarball/skia/src/shaders/SkShaderBase \
-    UnpackedTarball/skia/src/shaders/SkTransformShader \
-    UnpackedTarball/skia/src/shaders/SkTriColorShader \
+))
+
+# from file skia/gn/effects.gni:83, target "skia_colorfilters_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/effects/colorfilters/SkBlendModeColorFilter \
+    UnpackedTarball/skia/src/effects/colorfilters/SkColorFilterBase \
+    UnpackedTarball/skia/src/effects/colorfilters/SkColorSpaceXformColorFilter 
\
+    UnpackedTarball/skia/src/effects/colorfilters/SkComposeColorFilter \
+    UnpackedTarball/skia/src/effects/colorfilters/SkGaussianColorFilter \
+    UnpackedTarball/skia/src/effects/colorfilters/SkMatrixColorFilter \
+    UnpackedTarball/skia/src/effects/colorfilters/SkTableColorFilter \
+    UnpackedTarball/skia/src/effects/colorfilters/SkWorkingFormatColorFilter \
+))
+
+# from file skia/gn/effects.gni:104, target "skia_colorfilters_sksl_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/effects/colorfilters/SkRuntimeColorFilter \
+))
+
+# from file skia/gn/effects_imagefilters.gni:17, target 
"skia_effects_imagefilter_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/effects/imagefilters/SkBlendImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkBlurImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkColorFilterImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkComposeImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkCropImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkDisplacementMapImageFilter 
\
+    UnpackedTarball/skia/src/effects/imagefilters/SkDropShadowImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkImageImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkLightingImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkMagnifierImageFilter \
+    
UnpackedTarball/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkMatrixTransformImageFilter 
\
+    UnpackedTarball/skia/src/effects/imagefilters/SkMergeImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkMorphologyImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkPictureImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkRuntimeImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkShaderImageFilter \
+    UnpackedTarball/skia/src/effects/imagefilters/SkTileImageFilter \
+))
+
+# from file skia/gn/sksl.gni:42, target "skia_sksl_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/sksl/SkSLAnalysis \
+    UnpackedTarball/skia/src/sksl/SkSLBuiltinTypes \
+    UnpackedTarball/skia/src/sksl/SkSLCompiler \
+    UnpackedTarball/skia/src/sksl/SkSLConstantFolder \
+    UnpackedTarball/skia/src/sksl/SkSLContext \
+    UnpackedTarball/skia/src/sksl/SkSLErrorReporter \
+    UnpackedTarball/skia/src/sksl/SkSLInliner \
+    UnpackedTarball/skia/src/sksl/SkSLIntrinsicList \
+    UnpackedTarball/skia/src/sksl/SkSLLexer \
+    UnpackedTarball/skia/src/sksl/SkSLMangler \
+    UnpackedTarball/skia/src/sksl/SkSLModuleLoader \
+    UnpackedTarball/skia/src/sksl/SkSLOperator \
+    UnpackedTarball/skia/src/sksl/SkSLOutputStream \
+    UnpackedTarball/skia/src/sksl/SkSLParser \
+    UnpackedTarball/skia/src/sksl/SkSLPool \
+    UnpackedTarball/skia/src/sksl/SkSLPosition \
+    UnpackedTarball/skia/src/sksl/SkSLSampleUsage \
+    UnpackedTarball/skia/src/sksl/SkSLString \
+    UnpackedTarball/skia/src/sksl/SkSLThreadContext \
+    UnpackedTarball/skia/src/sksl/SkSLUtil \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLCheckProgramStructure \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLFinalizationChecks \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLGetReturnComplexity \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLHasSideEffects \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLIsConstantExpression \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLIsSameExpressionTree \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLIsTrivialExpression \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLProgramUsage \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLReturnsInputAlpha \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit \
+    UnpackedTarball/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLRasterPipelineBuilder \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLVMCodeGenerator \
     UnpackedTarball/skia/src/sksl/dsl/DSLExpression \
     UnpackedTarball/skia/src/sksl/dsl/DSLStatement \
     UnpackedTarball/skia/src/sksl/dsl/DSLType \
@@ -515,9 +755,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/ir/SkSLLiteral \
     UnpackedTarball/skia/src/sksl/ir/SkSLModifiers \
     UnpackedTarball/skia/src/sksl/ir/SkSLModifiersDeclaration \
-    UnpackedTarball/skia/src/sksl/ir/SkSLProgram \
-    UnpackedTarball/skia/src/sksl/ir/SkSLPrefixExpression \
     UnpackedTarball/skia/src/sksl/ir/SkSLPostfixExpression \
+    UnpackedTarball/skia/src/sksl/ir/SkSLPrefixExpression \
+    UnpackedTarball/skia/src/sksl/ir/SkSLProgram \
     UnpackedTarball/skia/src/sksl/ir/SkSLSetting \
     UnpackedTarball/skia/src/sksl/ir/SkSLStructDefinition \
     UnpackedTarball/skia/src/sksl/ir/SkSLSwitchCase \
@@ -530,53 +770,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/ir/SkSLVarDeclarations \
     UnpackedTarball/skia/src/sksl/ir/SkSLVariable \
     UnpackedTarball/skia/src/sksl/ir/SkSLVariableReference \
-    UnpackedTarball/skia/src/sksl/tracing/SkSLTraceHook \
     UnpackedTarball/skia/src/sksl/tracing/SkSLDebugTracePriv \
-    UnpackedTarball/skia/src/sksl/tracing/SkSLDebugTracePlayer \
-    UnpackedTarball/skia/src/sksl/SkSLAnalysis \
-    UnpackedTarball/skia/src/sksl/SkSLBuiltinTypes \
-    UnpackedTarball/skia/src/sksl/SkSLCompiler \
-    UnpackedTarball/skia/src/sksl/SkSLConstantFolder \
-    UnpackedTarball/skia/src/sksl/SkSLContext \
-    UnpackedTarball/skia/src/sksl/SkSLErrorReporter \
-    UnpackedTarball/skia/src/sksl/SkSLInliner \
-    UnpackedTarball/skia/src/sksl/SkSLIntrinsicList \
-    UnpackedTarball/skia/src/sksl/SkSLLexer \
-    UnpackedTarball/skia/src/sksl/SkSLMangler \
-    UnpackedTarball/skia/src/sksl/SkSLModuleLoader \
-    UnpackedTarball/skia/src/sksl/SkSLOperator \
-    UnpackedTarball/skia/src/sksl/SkSLOutputStream \
-    UnpackedTarball/skia/src/sksl/SkSLParser \
-    UnpackedTarball/skia/src/sksl/SkSLPool \
-    UnpackedTarball/skia/src/sksl/SkSLPosition \
-    UnpackedTarball/skia/src/sksl/SkSLSampleUsage \
-    UnpackedTarball/skia/src/sksl/SkSLString \
-    UnpackedTarball/skia/src/sksl/SkSLThreadContext \
-    UnpackedTarball/skia/src/sksl/SkSLUtil \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLCheckProgramStructure \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLFinalizationChecks \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLGetReturnComplexity \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLHasSideEffects \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLIsConstantExpression \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLIsSameExpressionTree \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLIsTrivialExpression \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLProgramUsage \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLReturnsInputAlpha \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo \
-    UnpackedTarball/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLGLSLCodeGenerator \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLMetalCodeGenerator \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVtoHLSL \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLVMCodeGenerator \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLWGSLCodeGenerator \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLRasterPipelineBuilder \
-    UnpackedTarball/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator \
+    UnpackedTarball/skia/src/sksl/tracing/SkSLTraceHook \
     UnpackedTarball/skia/src/sksl/transform/SkSLAddConstToVarModifiers \
     UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadFunctions \
     UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables \
@@ -589,27 +784,49 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/transform/SkSLRenamePrivateSymbols \
     UnpackedTarball/skia/src/sksl/transform/SkSLReplaceConstVarsWithLiterals \
     UnpackedTarball/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle \
+))
+
+# from file skia/gn/sksl.gni:253, target "skia_sksl_tracing_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/sksl/tracing/SkSLDebugTracePlayer \
+))
+
+# from file skia/gn/sksl.gni:261, target "skia_sksl_gpu_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/sksl/codegen/SkSLGLSLCodeGenerator \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLMetalCodeGenerator \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVtoHLSL \
+    UnpackedTarball/skia/src/sksl/codegen/SkSLWGSLCodeGenerator \
+))
+
+# from file skia/gn/utils.gni:55, target "skia_utils_private"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/utils/SkBase64 \
     UnpackedTarball/skia/src/utils/SkCamera \
     UnpackedTarball/skia/src/utils/SkCanvasStack \
     UnpackedTarball/skia/src/utils/SkCanvasStateUtils \
-    UnpackedTarball/skia/src/utils/SkDashPath \
-    UnpackedTarball/skia/src/utils/SkEventTracer \
-    UnpackedTarball/skia/src/utils/SkFloatToDecimal \
     UnpackedTarball/skia/src/utils/SkCharToGlyphCache \
     UnpackedTarball/skia/src/utils/SkClipStackUtils \
     UnpackedTarball/skia/src/utils/SkCustomTypeface \
+    UnpackedTarball/skia/src/utils/SkDashPath \
+    UnpackedTarball/skia/src/utils/SkEventTracer \
+    UnpackedTarball/skia/src/utils/SkFloatToDecimal \
     UnpackedTarball/skia/src/utils/SkJSON \
     UnpackedTarball/skia/src/utils/SkJSONWriter \
     UnpackedTarball/skia/src/utils/SkMatrix22 \
     UnpackedTarball/skia/src/utils/SkMultiPictureDocument \
-    UnpackedTarball/skia/src/utils/SkNullCanvas \
     UnpackedTarball/skia/src/utils/SkNWayCanvas \
+    UnpackedTarball/skia/src/utils/SkNullCanvas \
     UnpackedTarball/skia/src/utils/SkOSPath \
     UnpackedTarball/skia/src/utils/SkOrderedFontMgr \
     UnpackedTarball/skia/src/utils/SkPaintFilterCanvas \
-    UnpackedTarball/skia/src/utils/SkParseColor \
     UnpackedTarball/skia/src/utils/SkParse \
+    UnpackedTarball/skia/src/utils/SkParseColor \
     UnpackedTarball/skia/src/utils/SkParsePath \
     UnpackedTarball/skia/src/utils/SkPatchUtils \
     UnpackedTarball/skia/src/utils/SkPolyUtils \
@@ -617,110 +834,75 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/utils/SkShadowTessellator \
     UnpackedTarball/skia/src/utils/SkShadowUtils \
     UnpackedTarball/skia/src/utils/SkTextUtils \
+))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/utils/mac/SkCTFont \
+    UnpackedTarball/skia/src/utils/mac/SkCreateCGImageRef \
+))
+endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/utils/win/SkAutoCoInitialize \
+    UnpackedTarball/skia/src/utils/win/SkDWrite \
+    UnpackedTarball/skia/src/utils/win/SkDWriteFontFileStream \
+    UnpackedTarball/skia/src/utils/win/SkDWriteGeometrySink \
+    UnpackedTarball/skia/src/utils/win/SkHRESULT \
+    UnpackedTarball/skia/src/utils/win/SkIStream \
+))
+endif
+
+# from file skia/gn/xps.gni:19, target "skia_xps_sources"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/xps/SkXPSDevice \
     UnpackedTarball/skia/src/xps/SkXPSDocument \
 ))
 
+# from file skia/gn/gpu.gni:111, target "skia_ganesh_private"
+#
 ifneq ($(SKIA_GPU),)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/core/SkGpuBlurUtils \
-    UnpackedTarball/skia/src/gpu/AtlasTypes \
-    UnpackedTarball/skia/src/gpu/Blend \
-    UnpackedTarball/skia/src/gpu/BlendFormula \
-    UnpackedTarball/skia/src/gpu/DitherUtils \
-    UnpackedTarball/skia/src/gpu/RectanizerPow2 \
-    UnpackedTarball/skia/src/gpu/RectanizerSkyline \
-    UnpackedTarball/skia/src/gpu/ResourceKey \
-    UnpackedTarball/skia/src/gpu/ShaderErrorHandler \
-    UnpackedTarball/skia/src/gpu/Swizzle \
-    UnpackedTarball/skia/src/gpu/TiledTextureUtils \
     UnpackedTarball/skia/src/gpu/ganesh/ClipStack \
     UnpackedTarball/skia/src/gpu/ganesh/Device \
     UnpackedTarball/skia/src/gpu/ganesh/Device_drawTexture \
-    UnpackedTarball/skia/src/gpu/ganesh/GrBufferTransferRenderTask \
-    UnpackedTarball/skia/src/gpu/ganesh/GrBufferUpdateRenderTask \
-    UnpackedTarball/skia/src/gpu/ganesh/GrFragmentProcessors \
-    UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceProxyView \
-    UnpackedTarball/skia/src/gpu/ganesh/PathRenderer \
-    UnpackedTarball/skia/src/gpu/ganesh/PathRendererChain \
-    UnpackedTarball/skia/src/gpu/ganesh/StencilMaskHelper \
-    UnpackedTarball/skia/src/gpu/ganesh/SurfaceDrawContext \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBezierEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBicubicEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrColorTableEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrConvexPolyEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrCustomXfermode \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrDisableColorXP \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc \
-    
UnpackedTarball/skia/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor
 \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrMatrixConvolutionEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrMatrixEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrOvalEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrRRectEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrShadowGeoProc \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrSkSLFP \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrTextureEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect \
-    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrPathUtils \
-    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrQuad \
-    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrQuadUtils \
-    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrShape \
-    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrStyledShape \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLBlend \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLVarying \
-    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder \
-    UnpackedTarball/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache \
-    UnpackedTarball/skia/src/gpu/ganesh/gradients/GrGradientShader \
-    UnpackedTarball/skia/src/gpu/ganesh/image/GrImageUtils \
-    UnpackedTarball/skia/src/gpu/ganesh/image/GrTextureGenerator \
-    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_Ganesh \
-    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshBase \
-    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshFactories \
-    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshYUVA \
-    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_LazyTexture \
-    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_RasterPinnable \
     UnpackedTarball/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator \
     UnpackedTarball/skia/src/gpu/ganesh/GrAHardwareBufferUtils \
     UnpackedTarball/skia/src/gpu/ganesh/GrAttachment \
+    UnpackedTarball/skia/src/gpu/ganesh/GrAuditTrail \
     UnpackedTarball/skia/src/gpu/ganesh/GrBackendSemaphore \
     UnpackedTarball/skia/src/gpu/ganesh/GrBackendSurface \
     UnpackedTarball/skia/src/gpu/ganesh/GrBackendTextureImageGenerator \
     UnpackedTarball/skia/src/gpu/ganesh/GrBackendUtils \
+    UnpackedTarball/skia/src/gpu/ganesh/GrBlurUtils \
     UnpackedTarball/skia/src/gpu/ganesh/GrBufferAllocPool \
+    UnpackedTarball/skia/src/gpu/ganesh/GrBufferTransferRenderTask \
+    UnpackedTarball/skia/src/gpu/ganesh/GrBufferUpdateRenderTask \
     UnpackedTarball/skia/src/gpu/ganesh/GrCaps \
     UnpackedTarball/skia/src/gpu/ganesh/GrClientMappedBufferManager \
     UnpackedTarball/skia/src/gpu/ganesh/GrColorInfo \
     UnpackedTarball/skia/src/gpu/ganesh/GrColorSpaceXform \
-    UnpackedTarball/skia/src/gpu/ganesh/GrContext_Base \
     UnpackedTarball/skia/src/gpu/ganesh/GrContextThreadSafeProxy \
+    UnpackedTarball/skia/src/gpu/ganesh/GrContext_Base \
     UnpackedTarball/skia/src/gpu/ganesh/GrCopyRenderTask \
-    UnpackedTarball/skia/src/gpu/ganesh/GrDataUtils \
     UnpackedTarball/skia/src/gpu/ganesh/GrDDLContext \
     UnpackedTarball/skia/src/gpu/ganesh/GrDDLTask \
+    UnpackedTarball/skia/src/gpu/ganesh/GrDataUtils \
     UnpackedTarball/skia/src/gpu/ganesh/GrDefaultGeoProcFactory \
     UnpackedTarball/skia/src/gpu/ganesh/GrDeferredDisplayList \
     UnpackedTarball/skia/src/gpu/ganesh/GrDirectContext \
     UnpackedTarball/skia/src/gpu/ganesh/GrDirectContextPriv \
     UnpackedTarball/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector \
-    UnpackedTarball/skia/src/gpu/ganesh/GrDrawingManager \
     UnpackedTarball/skia/src/gpu/ganesh/GrDrawOpAtlas \
+    UnpackedTarball/skia/src/gpu/ganesh/GrDrawOpTest \
+    UnpackedTarball/skia/src/gpu/ganesh/GrDrawingManager \
     UnpackedTarball/skia/src/gpu/ganesh/GrDriverBugWorkarounds \
     UnpackedTarball/skia/src/gpu/ganesh/GrDynamicAtlas \
     UnpackedTarball/skia/src/gpu/ganesh/GrEagerVertexAllocator \
     UnpackedTarball/skia/src/gpu/ganesh/GrFinishCallbacks \
     UnpackedTarball/skia/src/gpu/ganesh/GrFixedClip \
     UnpackedTarball/skia/src/gpu/ganesh/GrFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/ganesh/GrFragmentProcessors \
     UnpackedTarball/skia/src/gpu/ganesh/GrGeometryProcessor \
     UnpackedTarball/skia/src/gpu/ganesh/GrGpu \
     UnpackedTarball/skia/src/gpu/ganesh/GrGpuBuffer \
@@ -736,8 +918,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/GrPaint \
     UnpackedTarball/skia/src/gpu/ganesh/GrPersistentCacheUtils \
     UnpackedTarball/skia/src/gpu/ganesh/GrPipeline \
-    UnpackedTarball/skia/src/gpu/ganesh/GrProcessorAnalysis \
     UnpackedTarball/skia/src/gpu/ganesh/GrProcessor \
+    UnpackedTarball/skia/src/gpu/ganesh/GrProcessorAnalysis \
     UnpackedTarball/skia/src/gpu/ganesh/GrProcessorSet \
     UnpackedTarball/skia/src/gpu/ganesh/GrProcessorUnitTest \
     UnpackedTarball/skia/src/gpu/ganesh/GrProgramDesc \
@@ -746,18 +928,19 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/GrProxyProvider \
     UnpackedTarball/skia/src/gpu/ganesh/GrRecordingContext \
     UnpackedTarball/skia/src/gpu/ganesh/GrRecordingContextPriv \
-    UnpackedTarball/skia/src/gpu/ganesh/GrRenderTask \
-    UnpackedTarball/skia/src/gpu/ganesh/GrRenderTaskCluster \
     UnpackedTarball/skia/src/gpu/ganesh/GrRenderTarget \
     UnpackedTarball/skia/src/gpu/ganesh/GrRenderTargetProxy \
+    UnpackedTarball/skia/src/gpu/ganesh/GrRenderTask \
+    UnpackedTarball/skia/src/gpu/ganesh/GrRenderTaskCluster \
     UnpackedTarball/skia/src/gpu/ganesh/GrResourceAllocator \
     UnpackedTarball/skia/src/gpu/ganesh/GrResourceCache \
     UnpackedTarball/skia/src/gpu/ganesh/GrResourceProvider \
     UnpackedTarball/skia/src/gpu/ganesh/GrRingBuffer \
-    UnpackedTarball/skia/src/gpu/ganesh/GrShaderCaps \
-    UnpackedTarball/skia/src/gpu/ganesh/GrShaderVar \
     UnpackedTarball/skia/src/gpu/ganesh/GrSPIRVUniformHandler \
     UnpackedTarball/skia/src/gpu/ganesh/GrSPIRVVaryingHandler \
+    UnpackedTarball/skia/src/gpu/ganesh/GrSWMaskHelper \
+    UnpackedTarball/skia/src/gpu/ganesh/GrShaderCaps \
+    UnpackedTarball/skia/src/gpu/ganesh/GrShaderVar \
     UnpackedTarball/skia/src/gpu/ganesh/GrStagingBufferManager \
     UnpackedTarball/skia/src/gpu/ganesh/GrStencilSettings \
     UnpackedTarball/skia/src/gpu/ganesh/GrStyle \
@@ -765,9 +948,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceCharacterization \
     UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceInfo \
     UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceProxy \
-    UnpackedTarball/skia/src/gpu/ganesh/GrSWMaskHelper \
+    UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceProxyView \
     UnpackedTarball/skia/src/gpu/ganesh/GrTestUtils \
-    UnpackedTarball/skia/src/gpu/ganesh/GrUniformDataManager \
     UnpackedTarball/skia/src/gpu/ganesh/GrTexture \
     UnpackedTarball/skia/src/gpu/ganesh/GrTextureProxy \
     UnpackedTarball/skia/src/gpu/ganesh/GrTextureRenderTargetProxy \
@@ -775,6 +957,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/GrThreadSafeCache \
     UnpackedTarball/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder \
     UnpackedTarball/skia/src/gpu/ganesh/GrTransferFromRenderTask \
+    UnpackedTarball/skia/src/gpu/ganesh/GrUniformDataManager \
     UnpackedTarball/skia/src/gpu/ganesh/GrUtil \
     UnpackedTarball/skia/src/gpu/ganesh/GrVertexChunkArray \
     UnpackedTarball/skia/src/gpu/ganesh/GrWaitRenderTask \
@@ -782,45 +965,64 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/GrXferProcessor \
     UnpackedTarball/skia/src/gpu/ganesh/GrYUVABackendTextures \
     UnpackedTarball/skia/src/gpu/ganesh/GrYUVATextureProxies \
+    UnpackedTarball/skia/src/gpu/ganesh/PathRenderer \
+    UnpackedTarball/skia/src/gpu/ganesh/PathRendererChain \
+    UnpackedTarball/skia/src/gpu/ganesh/SkGr \
+    UnpackedTarball/skia/src/gpu/ganesh/StencilMaskHelper \
+    UnpackedTarball/skia/src/gpu/ganesh/SurfaceContext \
+    UnpackedTarball/skia/src/gpu/ganesh/SurfaceDrawContext \
+    UnpackedTarball/skia/src/gpu/ganesh/SurfaceFillContext \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBezierEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBicubicEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrColorTableEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrConvexPolyEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrCustomXfermode \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrDisableColorXP \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc \
+    
UnpackedTarball/skia/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor
 \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrMatrixConvolutionEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrMatrixEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrOvalEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrRRectEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrShadowGeoProc \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrSkSLFP \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrTextureEffect \
+    UnpackedTarball/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect \
     UnpackedTarball/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator \
     UnpackedTarball/skia/src/gpu/ganesh/geometry/GrAATriangulator \
+    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrPathUtils \
+    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrQuad \
+    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrQuadUtils \
+    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrShape \
+    UnpackedTarball/skia/src/gpu/ganesh/geometry/GrStyledShape \
     UnpackedTarball/skia/src/gpu/ganesh/geometry/GrTriangulator \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLBlend \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLVarying \
+    UnpackedTarball/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder \
+    UnpackedTarball/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache \
+    UnpackedTarball/skia/src/gpu/ganesh/gradients/GrGradientShader \
+    UnpackedTarball/skia/src/gpu/ganesh/image/GrImageUtils \
+    UnpackedTarball/skia/src/gpu/ganesh/image/GrTextureGenerator \
+    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_Ganesh \
+    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshBase \
+    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshFactories \
+    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshYUVA \
+    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_LazyTexture \
+    UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_RasterPinnable \
     UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockCaps \
     UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockGpu \
     UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockTypes \
-    UnpackedTarball/skia/src/gpu/ganesh/surface/SkSurface_Ganesh \
-    UnpackedTarball/skia/src/gpu/ganesh/SkGr \
-    UnpackedTarball/skia/src/gpu/ganesh/SurfaceContext \
-    UnpackedTarball/skia/src/gpu/ganesh/SurfaceFillContext \
-    UnpackedTarball/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader \
-    UnpackedTarball/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader \
-    UnpackedTarball/skia/src/gpu/ganesh/tessellate/GrTessellationShader \
-    UnpackedTarball/skia/src/gpu/ganesh/tessellate/PathTessellator \
-    UnpackedTarball/skia/src/gpu/ganesh/tessellate/StrokeTessellator \
-    UnpackedTarball/skia/src/gpu/ganesh/text/GrAtlasManager \
-    UnpackedTarball/skia/src/gpu/PipelineUtils \
-    UnpackedTarball/skia/src/gpu/tessellate/FixedCountBufferUtils \
-    UnpackedTarball/skia/src/gpu/tessellate/Tessellation \
-    UnpackedTarball/skia/src/text/GlyphRun \
-    UnpackedTarball/skia/src/text/StrikeForGPU \
-    UnpackedTarball/skia/src/text/gpu/DistanceFieldAdjustTable \
-    UnpackedTarball/skia/src/text/gpu/GlyphVector \
-    UnpackedTarball/skia/src/text/gpu/Slug \
-    UnpackedTarball/skia/src/text/gpu/SlugImpl \
-    UnpackedTarball/skia/src/text/gpu/StrikeCache \
-    UnpackedTarball/skia/src/text/gpu/SubRunContainer \
-    UnpackedTarball/skia/src/text/gpu/SubRunAllocator \
-    UnpackedTarball/skia/src/text/gpu/SDFMaskFilter \
-    UnpackedTarball/skia/src/text/gpu/SDFTControl \
-    UnpackedTarball/skia/src/text/gpu/TextBlob \
-    UnpackedTarball/skia/src/text/gpu/TextBlobRedrawCoordinator \
-    UnpackedTarball/skia/src/text/gpu/VertexFiller \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/gpu/ganesh/GrAuditTrail \
-    UnpackedTarball/skia/src/gpu/ganesh/GrBlurUtils \
-    UnpackedTarball/skia/src/gpu/ganesh/GrDrawOpTest \
     UnpackedTarball/skia/src/gpu/ganesh/ops/AAConvexPathRenderer \
     UnpackedTarball/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer \
     UnpackedTarball/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer \
@@ -860,8 +1062,50 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/ops/TessellationPathRenderer \
     UnpackedTarball/skia/src/gpu/ganesh/ops/TextureOp \
     UnpackedTarball/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer \
+    UnpackedTarball/skia/src/gpu/ganesh/surface/SkSurface_Ganesh \
+    UnpackedTarball/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader \
+    UnpackedTarball/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader \
+    UnpackedTarball/skia/src/gpu/ganesh/tessellate/GrTessellationShader \
+    UnpackedTarball/skia/src/gpu/ganesh/tessellate/PathTessellator \
+    UnpackedTarball/skia/src/gpu/ganesh/tessellate/StrokeTessellator \
+    UnpackedTarball/skia/src/gpu/ganesh/text/GrAtlasManager \
+))
+endif
+
+# from file skia/gn/gpu.gni:1027, target "skia_shared_gpu_sources"
+#
+ifneq ($(SKIA_GPU),)
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/gpu/AtlasTypes \
+    UnpackedTarball/skia/src/gpu/Blend \
+    UnpackedTarball/skia/src/gpu/BlendFormula \
+    UnpackedTarball/skia/src/gpu/DitherUtils \
+    UnpackedTarball/skia/src/gpu/PipelineUtils \
+    UnpackedTarball/skia/src/gpu/RectanizerPow2 \
+    UnpackedTarball/skia/src/gpu/RectanizerSkyline \
+    UnpackedTarball/skia/src/gpu/ResourceKey \
+    UnpackedTarball/skia/src/gpu/ShaderErrorHandler \
+    UnpackedTarball/skia/src/gpu/Swizzle \
+    UnpackedTarball/skia/src/gpu/TiledTextureUtils \
+    UnpackedTarball/skia/src/gpu/tessellate/FixedCountBufferUtils \
+    UnpackedTarball/skia/src/gpu/tessellate/Tessellation \
+    UnpackedTarball/skia/src/text/gpu/DistanceFieldAdjustTable \
+    UnpackedTarball/skia/src/text/gpu/GlyphVector \
+    UnpackedTarball/skia/src/text/gpu/SDFMaskFilter \
+    UnpackedTarball/skia/src/text/gpu/SDFTControl \
+    UnpackedTarball/skia/src/text/gpu/Slug \
+    UnpackedTarball/skia/src/text/gpu/SlugImpl \
+    UnpackedTarball/skia/src/text/gpu/StrikeCache \
+    UnpackedTarball/skia/src/text/gpu/SubRunAllocator \
+    UnpackedTarball/skia/src/text/gpu/SubRunContainer \
+    UnpackedTarball/skia/src/text/gpu/TextBlob \
+    UnpackedTarball/skia/src/text/gpu/TextBlobRedrawCoordinator \
+    UnpackedTarball/skia/src/text/gpu/VertexFiller \
 ))
+endif
 
+# from file skia/gn/gpu.gni:757, target "skia_gpu_vk_private"
+#
 ifeq ($(SKIA_GPU),VULKAN)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkBuffer \
@@ -878,16 +1122,15 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkPipeline \
+    UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkPipelineState \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkPipelineStateCache \
-    UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkPipelineState \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkRenderPass \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkRenderTarget \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkResourceProvider \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkSampler \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion \
-    UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkSemaphore \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkTexture \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget \
@@ -895,107 +1138,21 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkUniformHandler \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkUtil \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkVaryingHandler \
-    UnpackedTarball/skia/src/gpu/vk/VulkanAMDMemoryAllocator \
-    UnpackedTarball/skia/src/gpu/vk/VulkanExtensions \
-    UnpackedTarball/skia/src/gpu/vk/VulkanInterface \
-    UnpackedTarball/skia/src/gpu/vk/VulkanMemory \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
-    UnpackedTarball/skia/tools/sk_app/VulkanWindowContext \
-    
UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \
 ))
-
-endif
 endif
 
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/ports/SkGlobalInitialization_default \
-    UnpackedTarball/skia/src/ports/SkImageGenerator_none \
-    UnpackedTarball/skia/src/ports/SkOSFile_stdio \
-))
-
-$(eval $(call gb_Library_add_exception_objects,skia,\
-    external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_AVX) \
-        $(LO_SKIA_AVOID_INLINE_COPIES) \
-))
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_hsw, \
-        $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) 
$(CXXFLAGS_INTRINSICS_FMA) \
-        $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \
-        $(LO_SKIA_AVOID_INLINE_COPIES) \
-))
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
-        $(LO_SKIA_AVOID_INLINE_COPIES) \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_skx, $(CXXFLAGS_INTRINSICS_AVX512)  
$(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512)\
-        $(LO_SKIA_AVOID_INLINE_COPIES) \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/WindowContext \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/ports/SkDebug_win \
-    UnpackedTarball/skia/src/ports/SkFontHost_win \
-    UnpackedTarball/skia/src/fonts/SkFontMgr_indirect \
-    UnpackedTarball/skia/src/ports/SkFontMgr_win_dw \
-    UnpackedTarball/skia/src/ports/SkFontMgr_win_dw_factory \
-    UnpackedTarball/skia/src/ports/SkOSFile_win \
-    UnpackedTarball/skia/src/ports/SkOSLibrary_win \
-    UnpackedTarball/skia/src/ports/SkScalerContext_win_dw \
-    UnpackedTarball/skia/src/ports/SkTypeface_win_dw \
-    UnpackedTarball/skia/src/utils/win/SkAutoCoInitialize \
-    UnpackedTarball/skia/src/utils/win/SkDWrite \
-    UnpackedTarball/skia/src/utils/win/SkDWriteFontFileStream \
-    UnpackedTarball/skia/src/utils/win/SkDWriteGeometrySink \
-    UnpackedTarball/skia/src/utils/win/SkHRESULT \
-    UnpackedTarball/skia/src/utils/win/SkIStream \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/win/RasterWindowContext_win \
-))
-
+# from file skia/gn/gpu.gni:826, target "skia_gpu_vk_chromium_private"
+#
 ifeq ($(SKIA_GPU),VULKAN)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win \
+    UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext \
 ))
 endif
 
-else ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/ports/SkDebug_stdio \
-    UnpackedTarball/skia/src/ports/SkImageGeneratorCG \
-    UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct \
-    UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct_factory \
-    UnpackedTarball/skia/src/ports/SkScalerContext_mac_ct \
-    UnpackedTarball/skia/src/ports/SkTypeface_mac_ct \
-    UnpackedTarball/skia/src/ports/SkOSFile_posix \
-    UnpackedTarball/skia/src/ports/SkOSLibrary_posix \
-    UnpackedTarball/skia/src/utils/mac/SkCTFont \
-    UnpackedTarball/skia/src/utils/mac/SkCreateCGImageRef \
-))
-
+# from file skia/gn/gpu.gni:941, target "skia_gpu_metal_private"
+#
+ifeq ($(OS),MACOSX)
 ifeq ($(SKIA_GPU),METAL)
-$(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
-    UnpackedTarball/skia/tools/sk_app/MetalWindowContext \
-    UnpackedTarball/skia/tools/sk_app/mac/MetalWindowContext_mac \
-    UnpackedTarball/skia/tools/sk_app/mac/WindowContextFactory_mac \
-))
-
-# Not used, uses OpenGL - 
UnpackedTarball/skia/tools/sk_app/mac/RasterWindowContext_mac
-
 $(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/mtl/GrMtlAttachment \
     UnpackedTarball/skia/src/gpu/ganesh/mtl/GrMtlBuffer \
@@ -1020,36 +1177,82 @@ $(eval $(call 
gb_Library_add_generated_objcxxobjects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/mtl/GrMtlUtil \
     UnpackedTarball/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler \
     UnpackedTarball/skia/src/gpu/ganesh/surface/SkSurface_GaneshMtl \
-    UnpackedTarball/skia/src/gpu/mtl/MtlUtils \
     , -fobjc-arc \
 ))
 endif
+endif
 
-else
+# from file skia/gn/gpu.gni:1115, target "skia_shared_vk_sources"
+#
+ifeq ($(SKIA_GPU),VULKAN)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/ports/SkDebug_stdio \
-    UnpackedTarball/skia/src/ports/SkFontConfigInterface \
-    UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct \
-    UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct_factory \
-    UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common \
-    UnpackedTarball/skia/src/ports/SkFontHost_FreeType \
-    UnpackedTarball/skia/src/ports/SkFontMgr_FontConfigInterface \
-    UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig \
-    UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig_factory \
-    UnpackedTarball/skia/src/ports/SkOSFile_posix \
-    UnpackedTarball/skia/src/ports/SkOSLibrary_posix \
+    UnpackedTarball/skia/src/gpu/vk/VulkanAMDMemoryAllocator \
+    UnpackedTarball/skia/src/gpu/vk/VulkanExtensions \
+    UnpackedTarball/skia/src/gpu/vk/VulkanInterface \
+    UnpackedTarball/skia/src/gpu/vk/VulkanMemory \
 ))
+endif
 
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/unix/RasterWindowContext_unix \
+# from file skia/gn/gpu.gni:1136, target "skia_shared_mtl_sources"
+#
+ifeq ($(OS),MACOSX)
+ifeq ($(SKIA_GPU),METAL)
+$(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
+    UnpackedTarball/skia/src/gpu/mtl/MtlUtils \
+    , -fobjc-arc \
 ))
+endif
+endif
+
+
+# from file skia/third_party/vulkanmemoryallocator/BUILD.gn:15, target 
"source_set("vulkanmemoryallocator")"
+#
 ifeq ($(SKIA_GPU),VULKAN)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/unix/VulkanWindowContext_unix \
+    
UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \
 ))
 endif
 
+
+# I need these, but they dont appear anywhere in the *.gn* build files?
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/fonts/SkRemotableFontMgr \
+    UnpackedTarball/skia/src/ports/SkImageGenerator_none \
+))
+ifeq ($(OS),MACOSX)
+ifeq ($(SKIA_GPU),METAL)
+$(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
+    UnpackedTarball/skia/tools/sk_app/mac/WindowContextFactory_mac \
+))
 endif
+endif
+
+# Not used, uses OpenGL - 
UnpackedTarball/skia/tools/sk_app/mac/RasterWindowContext_mac
+
+$(eval $(call gb_Library_add_exception_objects,skia,\
+    external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_AVX) \
+        $(LO_SKIA_AVOID_INLINE_COPIES) \
+))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/opts/SkOpts_hsw, \
+        $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) 
$(CXXFLAGS_INTRINSICS_FMA) \
+        $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \
+        $(LO_SKIA_AVOID_INLINE_COPIES) \
+))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
+        $(LO_SKIA_AVOID_INLINE_COPIES) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/opts/SkOpts_skx, $(CXXFLAGS_INTRINSICS_AVX512)  
$(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512)\
+        $(LO_SKIA_AVOID_INLINE_COPIES) \
+))
+
 
 # Skcms code is used by png writer, which is used by SkiaHelper::dump(). 
Building
 # this without optimizations would mean having each pixel of saved images be
@@ -1058,4 +1261,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/modules/skcms/skcms, $(gb_COMPILEROPTFLAGS) \
 ))
 
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/skia/README b/external/skia/README
index bf59a2384612..db0decdcb8ea 100644
--- a/external/skia/README
+++ b/external/skia/README
@@ -20,6 +20,9 @@ tar cvJf skia-mXX-$id.tar.xz skia
 And review differences for BUILD.gn and relevant files in gn/ :
 git diff chrome/mYY..chrome/mXX ./BUILD.gn ./gn
 
+The libreoffice Library_skia.mk file has been ordered and commented to make it 
easier to match
+up the changes in the external *.gn build files with the changes needed here.
+
 
 Debugging Skia:
 ===============

Reply via email to