Index: tools/BUILD.public.expected |
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected |
index 950f14895e5f30d6462782f35df7226e2101a21a..04edb2154523796a1259ba7d4e03e5375b9b2d85 100644 |
--- a/tools/BUILD.public.expected |
+++ b/tools/BUILD.public.expected |
@@ -87,6 +87,7 @@ BASE_HDRS = ['include/android/SkBRDAllocator.h', |
'include/core/SkPixelRef.h', |
'include/core/SkPixelSerializer.h', |
'include/core/SkPixmap.h', |
+ 'include/core/SkPngChunkReader.h', |
'include/core/SkPoint.h', |
'include/core/SkPoint3.h', |
'include/core/SkPostConfig.h', |
@@ -895,6 +896,8 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'src/gpu/batches/GrAALinearizingConvexPathRenderer.h', |
'src/gpu/batches/GrAAStrokeRectBatch.cpp', |
'src/gpu/batches/GrAAStrokeRectBatch.h', |
+ 'src/gpu/batches/GrAtlasTextBatch.cpp', |
+ 'src/gpu/batches/GrAtlasTextBatch.h', |
'src/gpu/batches/GrBatch.cpp', |
'src/gpu/batches/GrBatch.h', |
'src/gpu/batches/GrClearBatch.h', |
@@ -913,6 +916,8 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'src/gpu/batches/GrDrawPathBatch.h', |
'src/gpu/batches/GrDrawVerticesBatch.cpp', |
'src/gpu/batches/GrDrawVerticesBatch.h', |
+ 'src/gpu/batches/GrNinePatch.cpp', |
+ 'src/gpu/batches/GrNinePatch.h', |
'src/gpu/batches/GrNonAAFillRectBatch.cpp', |
'src/gpu/batches/GrNonAAFillRectBatch.h', |
'src/gpu/batches/GrNonAAStrokeRectBatch.cpp', |
@@ -1017,6 +1022,8 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'src/gpu/gl/GrGLTextureRenderTarget.h', |
'src/gpu/gl/GrGLUtil.cpp', |
'src/gpu/gl/GrGLUtil.h', |
+ 'src/gpu/gl/GrGLVaryingHandler.cpp', |
+ 'src/gpu/gl/GrGLVaryingHandler.h', |
'src/gpu/gl/GrGLVertexArray.cpp', |
'src/gpu/gl/GrGLVertexArray.h', |
'src/gpu/gl/GrGLVertexBuffer.cpp', |
@@ -1076,6 +1083,8 @@ BASE_SRCS = ['include/private/SkAtomics.h', |
'src/gpu/glsl/GrGLSLTextureSampler.h', |
'src/gpu/glsl/GrGLSLUtil.cpp', |
'src/gpu/glsl/GrGLSLUtil.h', |
+ 'src/gpu/glsl/GrGLSLVarying.cpp', |
+ 'src/gpu/glsl/GrGLSLVarying.h', |
'src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp', |
'src/gpu/glsl/GrGLSLVertexShaderBuilder.h', |
'src/gpu/glsl/GrGLSLXferProcessor.cpp', |
@@ -1444,6 +1453,7 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
'src/ports/SkTime_Unix.cpp', |
'*** END CONDITION_IOS ***', |
'*** BEGIN //conditions:default ***', |
+ 'src/fonts/SkFontMgr_fontconfig.cpp', |
'src/opts/Sk4px_SSE2.h', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapFilter_opts_SSE2.cpp', |
@@ -1471,11 +1481,18 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
'src/opts/opts_check_x86.cpp', |
'src/ports/SkDebug_stdio.cpp', |
'src/ports/SkDiscardableMemory_none.cpp', |
+ 'src/ports/SkFontConfigInterface_direct.cpp', |
+ 'src/ports/SkFontConfigInterface_direct.h', |
+ 'src/ports/SkFontConfigInterface_direct_google3.cpp', |
+ 'src/ports/SkFontConfigInterface_direct_google3.h', |
+ 'src/ports/SkFontConfigInterface_direct_google3_factory.cpp', |
+ 'src/ports/SkFontConfigTypeface.h', |
'src/ports/SkFontHost_FreeType.cpp', |
'src/ports/SkFontHost_FreeType_common.cpp', |
'src/ports/SkFontHost_FreeType_common.h', |
+ 'src/ports/SkFontHost_fontconfig.cpp', |
'src/ports/SkFontMgr_custom.cpp', |
- 'src/ports/SkFontMgr_custom_directory_factory.cpp', |
+ 'src/ports/SkFontMgr_fontconfig.cpp', |
'src/ports/SkGlobalInitialization_default.cpp', |
'src/ports/SkImageGenerator_skia.cpp', |
'src/ports/SkMemory_malloc.cpp', |
@@ -1539,7 +1556,8 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***', |
'src/ports/SkTLS_pthread.cpp', |
'src/ports/SkTime_Unix.cpp', |
'*** END CONDITION_ANDROID ***'] |
-BASE_SRCS_UNIX = ['src/opts/Sk4px_SSE2.h', |
+BASE_SRCS_UNIX = ['src/fonts/SkFontMgr_fontconfig.cpp', |
+ 'src/opts/Sk4px_SSE2.h', |
'src/opts/Sk4px_none.h', |
'src/opts/SkBitmapFilter_opts_SSE2.cpp', |
'src/opts/SkBitmapFilter_opts_SSE2.h', |
@@ -1566,11 +1584,18 @@ BASE_SRCS_UNIX = ['src/opts/Sk4px_SSE2.h', |
'src/opts/opts_check_x86.cpp', |
'src/ports/SkDebug_stdio.cpp', |
'src/ports/SkDiscardableMemory_none.cpp', |
+ 'src/ports/SkFontConfigInterface_direct.cpp', |
+ 'src/ports/SkFontConfigInterface_direct.h', |
+ 'src/ports/SkFontConfigInterface_direct_google3.cpp', |
+ 'src/ports/SkFontConfigInterface_direct_google3.h', |
+ 'src/ports/SkFontConfigInterface_direct_google3_factory.cpp', |
+ 'src/ports/SkFontConfigTypeface.h', |
'src/ports/SkFontHost_FreeType.cpp', |
'src/ports/SkFontHost_FreeType_common.cpp', |
'src/ports/SkFontHost_FreeType_common.h', |
+ 'src/ports/SkFontHost_fontconfig.cpp', |
'src/ports/SkFontMgr_custom.cpp', |
- 'src/ports/SkFontMgr_custom_directory_factory.cpp', |
+ 'src/ports/SkFontMgr_fontconfig.cpp', |
'src/ports/SkGlobalInitialization_default.cpp', |
'src/ports/SkImageGenerator_skia.cpp', |
'src/ports/SkMemory_malloc.cpp', |
@@ -1802,6 +1827,7 @@ DM_SRCS = ['dm/DM.cpp', |
'gm/patch.cpp', |
'gm/patchgrid.cpp', |
'gm/path_stroke_with_zero_length.cpp', |
+ 'gm/pathcontourstart.cpp', |
'gm/patheffects.cpp', |
'gm/pathfill.cpp', |
'gm/pathinterior.cpp', |
@@ -1844,6 +1870,7 @@ DM_SRCS = ['dm/DM.cpp', |
'gm/skbug_257.cpp', |
'gm/smallarc.cpp', |
'gm/smallimage.cpp', |
+ 'gm/smallpaths.cpp', |
'gm/spritebitmap.cpp', |
'gm/srcmode.cpp', |
'gm/stlouisarch.cpp', |
@@ -1934,6 +1961,7 @@ DM_SRCS = ['dm/DM.cpp', |
'tests/DrawPathTest.cpp', |
'tests/DrawTextTest.cpp', |
'tests/DynamicHashTest.cpp', |
+ 'tests/EGLImageTest.cpp', |
'tests/EmptyPathTest.cpp', |
'tests/ErrorTest.cpp', |
'tests/FillPathTest.cpp', |
@@ -2077,6 +2105,7 @@ DM_SRCS = ['dm/DM.cpp', |
'tests/PointTest.cpp', |
'tests/PremulAlphaRoundTripTest.cpp', |
'tests/QuickRejectTest.cpp', |
+ 'tests/RRectInPathTest.cpp', |
'tests/RTConfRegistryTest.cpp', |
'tests/RTreeTest.cpp', |
'tests/RandomTest.cpp', |
@@ -2129,6 +2158,7 @@ DM_SRCS = ['dm/DM.cpp', |
'tests/TessellatingPathRendererTests.cpp', |
'tests/Test.cpp', |
'tests/Test.h', |
+ 'tests/TestTest.cpp', |
'tests/TextBlobCacheTest.cpp', |
'tests/TextBlobTest.cpp', |
'tests/TextureCompressionTest.cpp', |
@@ -2187,6 +2217,7 @@ INCLUDES = ['include/android', |
'src/image', |
'src/lazy', |
'src/opts', |
+ 'src/ports', |
'src/pdf', |
'src/sfnt', |
'src/utils', |