build also OpenGL and Vulkan support in Skia

Change-Id: I0b42dd0ef4d1e92bcde7c4b64d2fc159e8bebcb1

2 files changed, 317 insertions, 314 deletions

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 319ff9d7496c..e5590cbc613a 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -19,8 +19,6 @@ $(eval $(call gb_Library_add_defs,skia,\
     -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1 \
     -DSK_SCALAR_IS_FLOAT \
     -DSK_CAN_USE_FLOAT \
-    -DSK_SUPPORT_GPU=0 \
-    -DSK_SAMPLES_FOR_X \
     -DSK_BUILD_FOR_UNIX \
     -DSK_USE_POSIX_THREADS \
     -DSK_RELEASE \
@@ -36,6 +34,13 @@ $(eval $(call gb_Library_add_defs,skia,\
     -DSK_USER_CONFIG_HEADER="<$(SRCDIR)/external/skia/configs/SkUserConfig.h>" \
 ))
 
+# TODO SKIA
+$(eval $(call gb_Library_add_defs,skia,\
+    -DSK_SUPPORT_GPU=1 \
+    -DSK_GL=1 \
+    -DSK_VULKAN=1 \
+))
+
 $(eval $(call gb_Library_use_externals,skia,\
     freetype \
     fontconfig \
@@ -48,6 +53,7 @@ ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,skia,\
     -lm \
     -ldl \
+    -lGLX \
 ))
 endif
 
@@ -63,6 +69,7 @@ $(eval $(call gb_Library_set_include,skia,\
     $$(INCLUDE) \
     -I$(call gb_UnpackedTarball_get_dir,skia) \
     -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/skcms/ \
+    -I$(call gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,skia,\
@@ -496,6 +503,309 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/ports/SkTLS_pthread \
 ))
 
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+    UnpackedTarball/skia/src/core/SkGpuBlurUtils \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCAtlas \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCClipPath \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCClipProcessor \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCConicShader \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCCoverageProcessor \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCCubicShader \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCDrawPathsOp \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCFiller \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCFillGeometry \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCPathCache \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCPathProcessor \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCPerFlushResources \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCQuadraticShader \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCStrokeGeometry \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCCStroker \
+    UnpackedTarball/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer \
+    UnpackedTarball/skia/src/gpu/ccpr/GrGSCoverageProcessor \
+    UnpackedTarball/skia/src/gpu/ccpr/GrOctoBounds \
+    UnpackedTarball/skia/src/gpu/ccpr/GrSampleMaskProcessor \
+    UnpackedTarball/skia/src/gpu/ccpr/GrStencilAtlasOp \
+    UnpackedTarball/skia/src/gpu/ccpr/GrVSCoverageProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrAARectEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrCircleBlurFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrCircleEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpRedEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrConfigConversionEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrConstColorProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrEllipseEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrMagnifierEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrMixerEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrPremulInputFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrRectBlurEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrRRectBlurEffect \
+    UnpackedTarball/skia/src/gpu/effects/generated/GrSimpleTextureEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrBezierEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrBicubicEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrBitmapTextGeoProc \
+    UnpackedTarball/skia/src/gpu/effects/GrConvexPolyEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrCoverageSetOpXP \
+    UnpackedTarball/skia/src/gpu/effects/GrCustomXfermode \
+    UnpackedTarball/skia/src/gpu/effects/GrDisableColorXP \
+    UnpackedTarball/skia/src/gpu/effects/GrDistanceFieldGeoProc \
+    UnpackedTarball/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/GrMatrixConvolutionEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrOvalEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrPorterDuffXferProcessor \
+    UnpackedTarball/skia/src/gpu/effects/GrRRectEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrShadowGeoProc \
+    UnpackedTarball/skia/src/gpu/effects/GrSkSLFP \
+    UnpackedTarball/skia/src/gpu/effects/GrSRGBEffect \
+    UnpackedTarball/skia/src/gpu/effects/GrTextureDomain \
+    UnpackedTarball/skia/src/gpu/effects/GrXfermodeFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/effects/GrYUVtoRGBEffect \
+    UnpackedTarball/skia/src/gpu/geometry/GrPathUtils \
+    UnpackedTarball/skia/src/gpu/geometry/GrQuad \
+    UnpackedTarball/skia/src/gpu/geometry/GrQuadUtils \
+    UnpackedTarball/skia/src/gpu/geometry/GrShape \
+    UnpackedTarball/skia/src/gpu/gl/builders/GrGLProgramBuilder \
+    UnpackedTarball/skia/src/gpu/gl/builders/GrGLShaderStringBuilder \
+    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen \
+    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleGLInterfaceAutogen \
+    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleHelpers \
+    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleInterface \
+    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen \
+    UnpackedTarball/skia/src/gpu/gl/GrGLBuffer \
+    UnpackedTarball/skia/src/gpu/gl/GrGLCaps \
+    UnpackedTarball/skia/src/gpu/gl/GrGLContext \
+    UnpackedTarball/skia/src/gpu/gl/GrGLExtensions \
+    UnpackedTarball/skia/src/gpu/gl/GrGLGLSL \
+    UnpackedTarball/skia/src/gpu/gl/GrGLGpuCommandBuffer \
+    UnpackedTarball/skia/src/gpu/gl/GrGLGpu \
+    UnpackedTarball/skia/src/gpu/gl/GrGLGpuProgramCache \
+    UnpackedTarball/skia/src/gpu/gl/GrGLInterfaceAutogen \
+    UnpackedTarball/skia/src/gpu/gl/GrGLPath \
+    UnpackedTarball/skia/src/gpu/gl/GrGLPathRendering \
+    UnpackedTarball/skia/src/gpu/gl/GrGLProgram \
+    UnpackedTarball/skia/src/gpu/gl/GrGLProgramDataManager \
+    UnpackedTarball/skia/src/gpu/gl/GrGLRenderTarget \
+    UnpackedTarball/skia/src/gpu/gl/GrGLSemaphore \
+    UnpackedTarball/skia/src/gpu/gl/GrGLStencilAttachment \
+    UnpackedTarball/skia/src/gpu/gl/GrGLTexture \
+    UnpackedTarball/skia/src/gpu/gl/GrGLTextureRenderTarget \
+    UnpackedTarball/skia/src/gpu/gl/GrGLTypesPriv \
+    UnpackedTarball/skia/src/gpu/gl/GrGLUniformHandler \
+    UnpackedTarball/skia/src/gpu/gl/GrGLUtil \
+    UnpackedTarball/skia/src/gpu/gl/GrGLVaryingHandler \
+    UnpackedTarball/skia/src/gpu/gl/GrGLVertexArray \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLBlend \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSL \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLGeometryProcessor \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramBuilder \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramDataManager \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLShaderBuilder \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLUtil \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLVarying \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder \
+    UnpackedTarball/skia/src/gpu/glsl/GrGLSLXferProcessor \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrClampedGradientEffect \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrDualIntervalGradientColorizer \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrLinearGradientLayout \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrRadialGradientLayout \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrSweepGradientLayout \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrTextureGradientColorizer \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrTiledGradientEffect \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout \
+    UnpackedTarball/skia/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer \
+    UnpackedTarball/skia/src/gpu/gradients/GrGradientBitmapCache \
+    UnpackedTarball/skia/src/gpu/gradients/GrGradientShader \
+    UnpackedTarball/skia/src/gpu/GrAHardwareBufferImageGenerator \
+    UnpackedTarball/skia/src/gpu/GrAHardwareBufferUtils \
+    UnpackedTarball/skia/src/gpu/GrAuditTrail \
+    UnpackedTarball/skia/src/gpu/GrBackendSurface \
+    UnpackedTarball/skia/src/gpu/GrBackendTextureImageGenerator \
+    UnpackedTarball/skia/src/gpu/GrBitmapTextureMaker \
+    UnpackedTarball/skia/src/gpu/GrBlurUtils \
+    UnpackedTarball/skia/src/gpu/GrBufferAllocPool \
+    UnpackedTarball/skia/src/gpu/GrCaps \
+    UnpackedTarball/skia/src/gpu/GrClipStackClip \
+    UnpackedTarball/skia/src/gpu/GrColorSpaceInfo \
+    UnpackedTarball/skia/src/gpu/GrColorSpaceXform \
+    UnpackedTarball/skia/src/gpu/GrContext_Base \
+    UnpackedTarball/skia/src/gpu/GrContext \
+    UnpackedTarball/skia/src/gpu/GrContextPriv \
+    UnpackedTarball/skia/src/gpu/GrContextThreadSafeProxy \
+    UnpackedTarball/skia/src/gpu/GrDataUtils \
+    UnpackedTarball/skia/src/gpu/GrDDLContext \
+    UnpackedTarball/skia/src/gpu/GrDefaultGeoProcFactory \
+    UnpackedTarball/skia/src/gpu/GrDeinstantiateProxyTracker \
+    UnpackedTarball/skia/src/gpu/GrDistanceFieldGenFromVector \
+    UnpackedTarball/skia/src/gpu/GrDrawingManager \
+    UnpackedTarball/skia/src/gpu/GrDrawOpAtlas \
+    UnpackedTarball/skia/src/gpu/GrDrawOpTest \
+    UnpackedTarball/skia/src/gpu/GrDriverBugWorkarounds \
+    UnpackedTarball/skia/src/gpu/GrFixedClip \
+    UnpackedTarball/skia/src/gpu/GrFragmentProcessor \
+    UnpackedTarball/skia/src/gpu/GrGpuBuffer \
+    UnpackedTarball/skia/src/gpu/GrGpuCommandBuffer \
+    UnpackedTarball/skia/src/gpu/GrGpu \
+    UnpackedTarball/skia/src/gpu/GrGpuResource \
+    UnpackedTarball/skia/src/gpu/GrImageContext \
+    UnpackedTarball/skia/src/gpu/GrImageTextureMaker \
+    UnpackedTarball/skia/src/gpu/GrLegacyDirectContext \
+    UnpackedTarball/skia/src/gpu/GrMemoryPool \
+    UnpackedTarball/skia/src/gpu/GrOnFlushResourceProvider \
+    UnpackedTarball/skia/src/gpu/GrOpFlushState \
+    UnpackedTarball/skia/src/gpu/GrOpList \
+    UnpackedTarball/skia/src/gpu/GrPaint \
+    UnpackedTarball/skia/src/gpu/GrPath \
+    UnpackedTarball/skia/src/gpu/GrPathProcessor \
+    UnpackedTarball/skia/src/gpu/GrPathRenderer \
+    UnpackedTarball/skia/src/gpu/GrPathRendererChain \
+    UnpackedTarball/skia/src/gpu/GrPathRendering \
+    UnpackedTarball/skia/src/gpu/GrPipeline \
+    UnpackedTarball/skia/src/gpu/GrPrimitiveProcessor \
+    UnpackedTarball/skia/src/gpu/GrProcessorAnalysis \
+    UnpackedTarball/skia/src/gpu/GrProcessor \
+    UnpackedTarball/skia/src/gpu/GrProcessorSet \
+    UnpackedTarball/skia/src/gpu/GrProcessorUnitTest \
+    UnpackedTarball/skia/src/gpu/GrProgramDesc \
+    UnpackedTarball/skia/src/gpu/GrProxyProvider \
+    UnpackedTarball/skia/src/gpu/GrRecordingContext \
+    UnpackedTarball/skia/src/gpu/GrRectanizer_pow2 \
+    UnpackedTarball/skia/src/gpu/GrRectanizer_skyline \
+    UnpackedTarball/skia/src/gpu/GrReducedClip \
+    UnpackedTarball/skia/src/gpu/GrRenderTargetContext \
+    UnpackedTarball/skia/src/gpu/GrRenderTarget \
+    UnpackedTarball/skia/src/gpu/GrRenderTargetOpList \
+    UnpackedTarball/skia/src/gpu/GrRenderTargetProxy \
+    UnpackedTarball/skia/src/gpu/GrResourceAllocator \
+    UnpackedTarball/skia/src/gpu/GrResourceCache \
+    UnpackedTarball/skia/src/gpu/GrResourceProvider \
+    UnpackedTarball/skia/src/gpu/GrSamplePatternDictionary \
+    UnpackedTarball/skia/src/gpu/GrShaderCaps \
+    UnpackedTarball/skia/src/gpu/GrShaderUtils \
+    UnpackedTarball/skia/src/gpu/GrShaderVar \
+    UnpackedTarball/skia/src/gpu/GrSoftwarePathRenderer \
+    UnpackedTarball/skia/src/gpu/GrStencilAttachment \
+    UnpackedTarball/skia/src/gpu/GrStencilSettings \
+    UnpackedTarball/skia/src/gpu/GrStyle \
+    UnpackedTarball/skia/src/gpu/GrSurfaceContext \
+    UnpackedTarball/skia/src/gpu/GrSurface \
+    UnpackedTarball/skia/src/gpu/GrSurfaceProxy \
+    UnpackedTarball/skia/src/gpu/GrSwizzle \
+    UnpackedTarball/skia/src/gpu/GrSWMaskHelper \
+    UnpackedTarball/skia/src/gpu/GrTessellator \
+    UnpackedTarball/skia/src/gpu/GrTestUtils \
+    UnpackedTarball/skia/src/gpu/GrTextureAdjuster \
+    UnpackedTarball/skia/src/gpu/GrTextureContext \
+    UnpackedTarball/skia/src/gpu/GrTexture \
+    UnpackedTarball/skia/src/gpu/GrTextureMaker \
+    UnpackedTarball/skia/src/gpu/GrTextureOpList \
+    UnpackedTarball/skia/src/gpu/GrTextureProducer \
+    UnpackedTarball/skia/src/gpu/GrTextureProxy \
+    UnpackedTarball/skia/src/gpu/GrTextureRenderTargetProxy \
+    UnpackedTarball/skia/src/gpu/GrXferProcessor \
+    UnpackedTarball/skia/src/gpu/GrYUVProvider \
+    UnpackedTarball/skia/src/gpu/mock/GrMockGpu \
+    UnpackedTarball/skia/src/gpu/mock/GrMockTypes \
+    UnpackedTarball/skia/src/gpu/ops/GrAAConvexPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrAAConvexTessellator \
+    UnpackedTarball/skia/src/gpu/ops/GrAAHairLinePathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrAtlasTextOp \
+    UnpackedTarball/skia/src/gpu/ops/GrClearOp \
+    UnpackedTarball/skia/src/gpu/ops/GrClearStencilClipOp \
+    UnpackedTarball/skia/src/gpu/ops/GrCopySurfaceOp \
+    UnpackedTarball/skia/src/gpu/ops/GrDashLinePathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrDashOp \
+    UnpackedTarball/skia/src/gpu/ops/GrDebugMarkerOp \
+    UnpackedTarball/skia/src/gpu/ops/GrDefaultPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrDrawableOp \
+    UnpackedTarball/skia/src/gpu/ops/GrDrawAtlasOp \
+    UnpackedTarball/skia/src/gpu/ops/GrDrawPathOp \
+    UnpackedTarball/skia/src/gpu/ops/GrDrawVerticesOp \
+    UnpackedTarball/skia/src/gpu/ops/GrFillRectOp \
+    UnpackedTarball/skia/src/gpu/ops/GrFillRRectOp \
+    UnpackedTarball/skia/src/gpu/ops/GrLatticeOp \
+    UnpackedTarball/skia/src/gpu/ops/GrMeshDrawOp \
+    UnpackedTarball/skia/src/gpu/ops/GrOp \
+    UnpackedTarball/skia/src/gpu/ops/GrOvalOpFactory \
+    UnpackedTarball/skia/src/gpu/ops/GrQuadPerEdgeAA \
+    UnpackedTarball/skia/src/gpu/ops/GrRegionOp \
+    UnpackedTarball/skia/src/gpu/ops/GrSemaphoreOp \
+    UnpackedTarball/skia/src/gpu/ops/GrShadowRRectOp \
+    UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \
+    UnpackedTarball/skia/src/gpu/ops/GrSmallPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrStencilAndCoverPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrStencilPathOp \
+    UnpackedTarball/skia/src/gpu/ops/GrStrokeRectOp \
+    UnpackedTarball/skia/src/gpu/ops/GrTessellatingPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrTextureOp \
+    UnpackedTarball/skia/src/gpu/ops/GrTransferFromOp \
+    UnpackedTarball/skia/src/gpu/SkGpuDevice \
+    UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \
+    UnpackedTarball/skia/src/gpu/SkGr \
+    UnpackedTarball/skia/src/gpu/text/GrAtlasManager \
+    UnpackedTarball/skia/src/gpu/text/GrDistanceFieldAdjustTable \
+    UnpackedTarball/skia/src/gpu/text/GrSDFMaskFilter \
+    UnpackedTarball/skia/src/gpu/text/GrStrikeCache \
+    UnpackedTarball/skia/src/gpu/text/GrTextBlobCache \
+    UnpackedTarball/skia/src/gpu/text/GrTextBlob \
+    UnpackedTarball/skia/src/gpu/text/GrTextBlobVertexRegenerator \
+    UnpackedTarball/skia/src/gpu/text/GrTextContext \
+    UnpackedTarball/skia/src/image/SkImage_GpuBase \
+    UnpackedTarball/skia/src/image/SkImage_Gpu \
+    UnpackedTarball/skia/src/image/SkImage_GpuYUVA \
+    UnpackedTarball/skia/src/image/SkSurface_Gpu \
+    UnpackedTarball/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx \
+    UnpackedTarball/skia/src/gpu/vk/GrVkAMDMemoryAllocator \
+    UnpackedTarball/skia/src/gpu/vk/GrVkBuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkBufferView \
+    UnpackedTarball/skia/src/gpu/vk/GrVkCaps \
+    UnpackedTarball/skia/src/gpu/vk/GrVkCommandBuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkCommandPool \
+    UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorPool \
+    UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSet \
+    UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSetManager \
+    UnpackedTarball/skia/src/gpu/vk/GrVkExtensions \
+    UnpackedTarball/skia/src/gpu/vk/GrVkFramebuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkGpuCommandBuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkGpu \
+    UnpackedTarball/skia/src/gpu/vk/GrVkImage \
+    UnpackedTarball/skia/src/gpu/vk/GrVkImageView \
+    UnpackedTarball/skia/src/gpu/vk/GrVkIndexBuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkInterface \
+    UnpackedTarball/skia/src/gpu/vk/GrVkMemory \
+    UnpackedTarball/skia/src/gpu/vk/GrVkPipeline \
+    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineLayout \
+    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateBuilder \
+    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateCache \
+    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineState \
+    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateDataManager \
+    UnpackedTarball/skia/src/gpu/vk/GrVkRenderPass \
+    UnpackedTarball/skia/src/gpu/vk/GrVkRenderTarget \
+    UnpackedTarball/skia/src/gpu/vk/GrVkResourceProvider \
+    UnpackedTarball/skia/src/gpu/vk/GrVkSampler \
+    UnpackedTarball/skia/src/gpu/vk/GrVkSamplerYcbcrConversion \
+    UnpackedTarball/skia/src/gpu/vk/GrVkSecondaryCBDrawContext \
+    UnpackedTarball/skia/src/gpu/vk/GrVkSemaphore \
+    UnpackedTarball/skia/src/gpu/vk/GrVkStencilAttachment \
+    UnpackedTarball/skia/src/gpu/vk/GrVkTexture \
+    UnpackedTarball/skia/src/gpu/vk/GrVkTextureRenderTarget \
+    UnpackedTarball/skia/src/gpu/vk/GrVkTransferBuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkTypesPriv \
+    UnpackedTarball/skia/src/gpu/vk/GrVkUniformBuffer \
+    UnpackedTarball/skia/src/gpu/vk/GrVkUniformHandler \
+    UnpackedTarball/skia/src/gpu/vk/GrVkUtil \
+    UnpackedTarball/skia/src/gpu/vk/GrVkVaryingHandler \
+    UnpackedTarball/skia/src/gpu/vk/GrVkVertexBuffer \
+))
+
 #    UnpackedTarball/skia/src/android/SkAndroidFrameworkUtils \
 #    UnpackedTarball/skia/src/android/SkAnimatedImage \
 #    UnpackedTarball/skia/src/android/SkBitmapRegionCodec \
@@ -510,7 +820,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 #    UnpackedTarball/skia/src/gpu/gl/android/GrGLMakeNativeInterface_android \
 #    UnpackedTarball/skia/src/gpu/gl/egl/GrGLMakeNativeInterface_egl \
 #    UnpackedTarball/skia/src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw \
-#    UnpackedTarball/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx \
 #    UnpackedTarball/skia/src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS \
 #    UnpackedTarball/skia/src/gpu/gl/mac/GrGLMakeNativeInterface_mac \
 #    UnpackedTarball/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win \
@@ -584,48 +893,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 #    UnpackedTarball/skia/src/gpu/dawn/GrDawnGpu \
 #    UnpackedTarball/skia/src/gpu/dawn/GrDawnRenderTarget \
 #    UnpackedTarball/skia/src/gpu/dawn/GrDawnUtil \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkAMDMemoryAllocator \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkBuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkBufferView \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkCaps \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkCommandBuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkCommandPool \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorPool \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSet \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSetManager \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkExtensions \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkFramebuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkGpuCommandBuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkGpu \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkImage \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkImageView \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkIndexBuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkInterface \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkMemory \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkPipeline \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineLayout \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateBuilder \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateCache \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineState \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateDataManager \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkRenderPass \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkRenderTarget \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkResourceProvider \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkSampler \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkSamplerYcbcrConversion \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkSecondaryCBDrawContext \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkSemaphore \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkStencilAttachment \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkTexture \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkTextureRenderTarget \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkTransferBuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkTypesPriv \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkUniformBuffer \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkUniformHandler \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkUtil \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkVaryingHandler \
-#    UnpackedTarball/skia/src/gpu/vk/GrVkVertexBuffer \
-
 #    UnpackedTarball/skia/src/sksl/SkSLMain \
 #    UnpackedTarball/skia/src/sksl/lex/Main \
 #    UnpackedTarball/skia/src/sksl/lex/NFA \
@@ -636,269 +903,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 #    UnpackedTarball/skia/src/atlastext/SkAtlasTextTarget \
 #    UnpackedTarball/skia/src/atlastext/SkInternalAtlasTextContext \
 
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCAtlas \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCClipPath \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCClipProcessor \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCConicShader \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCCoverageProcessor \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCCubicShader \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCDrawPathsOp \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCFiller \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCFillGeometry \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCPathCache \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCPathProcessor \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCPerFlushResources \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCQuadraticShader \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCStrokeGeometry \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCCStroker \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrGSCoverageProcessor \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrOctoBounds \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrSampleMaskProcessor \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrStencilAtlasOp \
-#    UnpackedTarball/skia/src/gpu/ccpr/GrVSCoverageProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrAARectEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrCircleBlurFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrCircleEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpRedEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrConfigConversionEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrConstColorProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrEllipseEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrMagnifierEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrMixerEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrPremulInputFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrRectBlurEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrRRectBlurEffect \
-#    UnpackedTarball/skia/src/gpu/effects/generated/GrSimpleTextureEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrBezierEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrBicubicEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrBitmapTextGeoProc \
-#    UnpackedTarball/skia/src/gpu/effects/GrConvexPolyEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrCoverageSetOpXP \
-#    UnpackedTarball/skia/src/gpu/effects/GrCustomXfermode \
-#    UnpackedTarball/skia/src/gpu/effects/GrDisableColorXP \
-#    UnpackedTarball/skia/src/gpu/effects/GrDistanceFieldGeoProc \
-#    UnpackedTarball/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/GrMatrixConvolutionEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrOvalEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrPorterDuffXferProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/GrRRectEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrShadowGeoProc \
-#    UnpackedTarball/skia/src/gpu/effects/GrSkSLFP \
-#    UnpackedTarball/skia/src/gpu/effects/GrSRGBEffect \
-#    UnpackedTarball/skia/src/gpu/effects/GrTextureDomain \
-#    UnpackedTarball/skia/src/gpu/effects/GrXfermodeFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/effects/GrYUVtoRGBEffect \
-#    UnpackedTarball/skia/src/gpu/geometry/GrPathUtils \
-#    UnpackedTarball/skia/src/gpu/geometry/GrQuad \
-#    UnpackedTarball/skia/src/gpu/geometry/GrQuadUtils \
-#    UnpackedTarball/skia/src/gpu/geometry/GrShape \
-#    UnpackedTarball/skia/src/gpu/gl/builders/GrGLProgramBuilder \
-#    UnpackedTarball/skia/src/gpu/gl/builders/GrGLShaderStringBuilder \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleGLInterfaceAutogen \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleHelpers \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleInterface \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLBuffer \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLCaps \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLContext \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLExtensions \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLGLSL \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLGpuCommandBuffer \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLGpu \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLGpuProgramCache \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLInterfaceAutogen \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLPath \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLPathRendering \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLProgram \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLProgramDataManager \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLRenderTarget \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLSemaphore \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLStencilAttachment \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLTexture \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLTextureRenderTarget \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLTypesPriv \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLUniformHandler \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLUtil \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLVaryingHandler \
-#    UnpackedTarball/skia/src/gpu/gl/GrGLVertexArray \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLBlend \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSL \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLGeometryProcessor \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramBuilder \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramDataManager \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLShaderBuilder \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLUtil \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLVarying \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder \
-#    UnpackedTarball/skia/src/gpu/glsl/GrGLSLXferProcessor \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrClampedGradientEffect \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrDualIntervalGradientColorizer \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrLinearGradientLayout \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrRadialGradientLayout \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrSweepGradientLayout \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrTextureGradientColorizer \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrTiledGradientEffect \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout \
-#    UnpackedTarball/skia/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer \
-#    UnpackedTarball/skia/src/gpu/gradients/GrGradientBitmapCache \
-#    UnpackedTarball/skia/src/gpu/gradients/GrGradientShader \
-#    UnpackedTarball/skia/src/gpu/GrAHardwareBufferImageGenerator \
-#    UnpackedTarball/skia/src/gpu/GrAHardwareBufferUtils \
-#    UnpackedTarball/skia/src/gpu/GrAuditTrail \
-#    UnpackedTarball/skia/src/gpu/GrBackendSurface \
-#    UnpackedTarball/skia/src/gpu/GrBackendTextureImageGenerator \
-#    UnpackedTarball/skia/src/gpu/GrBitmapTextureMaker \
-#    UnpackedTarball/skia/src/gpu/GrBlurUtils \
-#    UnpackedTarball/skia/src/gpu/GrBufferAllocPool \
-#    UnpackedTarball/skia/src/gpu/GrCaps \
-#    UnpackedTarball/skia/src/gpu/GrClipStackClip \
-#    UnpackedTarball/skia/src/gpu/GrColorSpaceInfo \
-#    UnpackedTarball/skia/src/gpu/GrColorSpaceXform \
-#    UnpackedTarball/skia/src/gpu/GrContext_Base \
-#    UnpackedTarball/skia/src/gpu/GrContext \
-#    UnpackedTarball/skia/src/gpu/GrContextPriv \
-#    UnpackedTarball/skia/src/gpu/GrContextThreadSafeProxy \
-#    UnpackedTarball/skia/src/gpu/GrDataUtils \
-#    UnpackedTarball/skia/src/gpu/GrDDLContext \
-#    UnpackedTarball/skia/src/gpu/GrDefaultGeoProcFactory \
-#    UnpackedTarball/skia/src/gpu/GrDeinstantiateProxyTracker \
-#    UnpackedTarball/skia/src/gpu/GrDistanceFieldGenFromVector \
-#    UnpackedTarball/skia/src/gpu/GrDrawingManager \
-#    UnpackedTarball/skia/src/gpu/GrDrawOpAtlas \
-#    UnpackedTarball/skia/src/gpu/GrDrawOpTest \
-#    UnpackedTarball/skia/src/gpu/GrDriverBugWorkarounds \
-#    UnpackedTarball/skia/src/gpu/GrFixedClip \
-#    UnpackedTarball/skia/src/gpu/GrFragmentProcessor \
-#    UnpackedTarball/skia/src/gpu/GrGpuBuffer \
-#    UnpackedTarball/skia/src/gpu/GrGpuCommandBuffer \
-#    UnpackedTarball/skia/src/gpu/GrGpu \
-#    UnpackedTarball/skia/src/gpu/GrGpuResource \
-#    UnpackedTarball/skia/src/gpu/GrImageContext \
-#    UnpackedTarball/skia/src/gpu/GrImageTextureMaker \
-#    UnpackedTarball/skia/src/gpu/GrLegacyDirectContext \
-#    UnpackedTarball/skia/src/gpu/GrMemoryPool \
-#    UnpackedTarball/skia/src/gpu/GrOnFlushResourceProvider \
-#    UnpackedTarball/skia/src/gpu/GrOpFlushState \
-#    UnpackedTarball/skia/src/gpu/GrOpList \
-#    UnpackedTarball/skia/src/gpu/GrPaint \
-#    UnpackedTarball/skia/src/gpu/GrPath \
-#    UnpackedTarball/skia/src/gpu/GrPathProcessor \
-#    UnpackedTarball/skia/src/gpu/GrPathRenderer \
-#    UnpackedTarball/skia/src/gpu/GrPathRendererChain \
-#    UnpackedTarball/skia/src/gpu/GrPathRendering \
-#    UnpackedTarball/skia/src/gpu/GrPipeline \
-#    UnpackedTarball/skia/src/gpu/GrPrimitiveProcessor \
-#    UnpackedTarball/skia/src/gpu/GrProcessorAnalysis \
-#    UnpackedTarball/skia/src/gpu/GrProcessor \
-#    UnpackedTarball/skia/src/gpu/GrProcessorSet \
-#    UnpackedTarball/skia/src/gpu/GrProcessorUnitTest \
-#    UnpackedTarball/skia/src/gpu/GrProgramDesc \
-#    UnpackedTarball/skia/src/gpu/GrProxyProvider \
-#    UnpackedTarball/skia/src/gpu/GrRecordingContext \
-#    UnpackedTarball/skia/src/gpu/GrRectanizer_pow2 \
-#    UnpackedTarball/skia/src/gpu/GrRectanizer_skyline \
-#    UnpackedTarball/skia/src/gpu/GrReducedClip \
-#    UnpackedTarball/skia/src/gpu/GrRenderTargetContext \
-#    UnpackedTarball/skia/src/gpu/GrRenderTarget \
-#    UnpackedTarball/skia/src/gpu/GrRenderTargetOpList \
-#    UnpackedTarball/skia/src/gpu/GrRenderTargetProxy \
-#    UnpackedTarball/skia/src/gpu/GrResourceAllocator \
-#    UnpackedTarball/skia/src/gpu/GrResourceCache \
-#    UnpackedTarball/skia/src/gpu/GrResourceProvider \
-#    UnpackedTarball/skia/src/gpu/GrSamplePatternDictionary \
-#    UnpackedTarball/skia/src/gpu/GrShaderCaps \
-#    UnpackedTarball/skia/src/gpu/GrShaderUtils \
-#    UnpackedTarball/skia/src/gpu/GrShaderVar \
-#    UnpackedTarball/skia/src/gpu/GrSoftwarePathRenderer \
-#    UnpackedTarball/skia/src/gpu/GrStencilAttachment \
-#    UnpackedTarball/skia/src/gpu/GrStencilSettings \
-#    UnpackedTarball/skia/src/gpu/GrStyle \
-#    UnpackedTarball/skia/src/gpu/GrSurfaceContext \
-#    UnpackedTarball/skia/src/gpu/GrSurface \
-#    UnpackedTarball/skia/src/gpu/GrSurfaceProxy \
-#    UnpackedTarball/skia/src/gpu/GrSwizzle \
-#    UnpackedTarball/skia/src/gpu/GrSWMaskHelper \
-#    UnpackedTarball/skia/src/gpu/GrTessellator \
-#    UnpackedTarball/skia/src/gpu/GrTestUtils \
-#    UnpackedTarball/skia/src/gpu/GrTextureAdjuster \
-#    UnpackedTarball/skia/src/gpu/GrTextureContext \
-#    UnpackedTarball/skia/src/gpu/GrTexture \
-#    UnpackedTarball/skia/src/gpu/GrTextureMaker \
-#    UnpackedTarball/skia/src/gpu/GrTextureOpList \
-#    UnpackedTarball/skia/src/gpu/GrTextureProducer \
-#    UnpackedTarball/skia/src/gpu/GrTextureProxy \
-#    UnpackedTarball/skia/src/gpu/GrTextureRenderTargetProxy \
-#    UnpackedTarball/skia/src/gpu/GrXferProcessor \
-#    UnpackedTarball/skia/src/gpu/GrYUVProvider \
-#    UnpackedTarball/skia/src/gpu/mock/GrMockGpu \
-#    UnpackedTarball/skia/src/gpu/mock/GrMockTypes \
-#    UnpackedTarball/skia/src/gpu/ops/GrAAConvexPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrAAConvexTessellator \
-#    UnpackedTarball/skia/src/gpu/ops/GrAAHairLinePathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrAtlasTextOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrClearOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrClearStencilClipOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrCopySurfaceOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrDashLinePathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrDashOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrDebugMarkerOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrDefaultPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrDrawableOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrDrawAtlasOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrDrawPathOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrDrawVerticesOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrFillRectOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrFillRRectOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrLatticeOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrMeshDrawOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrOvalOpFactory \
-#    UnpackedTarball/skia/src/gpu/ops/GrQuadPerEdgeAA \
-#    UnpackedTarball/skia/src/gpu/ops/GrRegionOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrSemaphoreOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrShadowRRectOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \
-#    UnpackedTarball/skia/src/gpu/ops/GrSmallPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrStencilAndCoverPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrStencilPathOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrStrokeRectOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrTessellatingPathRenderer \
-#    UnpackedTarball/skia/src/gpu/ops/GrTextureOp \
-#    UnpackedTarball/skia/src/gpu/ops/GrTransferFromOp \
-#    UnpackedTarball/skia/src/gpu/SkGpuDevice \
-#    UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \
-#    UnpackedTarball/skia/src/gpu/SkGr \
-#    UnpackedTarball/skia/src/gpu/text/GrAtlasManager \
-#    UnpackedTarball/skia/src/gpu/text/GrDistanceFieldAdjustTable \
-#    UnpackedTarball/skia/src/gpu/text/GrSDFMaskFilter \
-#    UnpackedTarball/skia/src/gpu/text/GrStrikeCache \
-#    UnpackedTarball/skia/src/gpu/text/GrTextBlobCache \
-#    UnpackedTarball/skia/src/gpu/text/GrTextBlob \
-#    UnpackedTarball/skia/src/gpu/text/GrTextBlobVertexRegenerator \
-#    UnpackedTarball/skia/src/gpu/text/GrTextContext \
-
-#    UnpackedTarball/skia/src/core/SkGpuBlurUtils \
-#    UnpackedTarball/skia/src/image/SkImage_GpuBase \
-#    UnpackedTarball/skia/src/image/SkImage_Gpu \
-#    UnpackedTarball/skia/src/image/SkImage_GpuYUVA \
-#    UnpackedTarball/skia/src/image/SkSurface_Gpu \
-
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/third_party/gif/SkGifImageReader \
     UnpackedTarball/skia/third_party/skcms/skcms \
+    UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/skia/configs/SkUserConfig.h b/external/skia/configs/SkUserConfig.h
index 77973df77b48..19372a4621ba 100644
--- a/external/skia/configs/SkUserConfig.h
+++ b/external/skia/configs/SkUserConfig.h
@@ -60,7 +60,7 @@
     here.
  */
 //#define SK_DEBUG
-#define SK_RELEASE
+//#define SK_RELEASE
 
 /*  Skia has certain debug-only code that is extremely intensive even for debug
     builds.  This code is useful for diagnosing specific issues, but is not
@@ -175,14 +175,9 @@
 */
 //#undef SK_USER_TRACE_INCLUDE_FILE
 
-/*  Change the ordering to work in X windows.
+/*  Change the kN32_SkColorType ordering to BGRA to work in X windows.
  */
-#ifdef SK_SAMPLES_FOR_X
-#define SK_R32_SHIFT 16
-#define SK_G32_SHIFT 8
-#define SK_B32_SHIFT 0
-#define SK_A32_SHIFT 24
-#endif
+//#define SK_R32_SHIFT    16
 
 /* Determines whether to build code that supports the GPU backend. Some classes
    that are not GPU-specific, such as SkShader subclasses, have optional code
@@ -191,6 +186,6 @@
    directories from your include search path when you're not building the GPU
    backend. Defaults to 1 (build the GPU code).
  */
-#define SK_SUPPORT_GPU 0
+//#define SK_SUPPORT_GPU 1
 
 #endif