Fix Google3 fonts.

tools/BUILD.public.expected

 This file is auto-generated by tools/BUILD_simulator.py.
 It expands BUILD.public to make it easy to see changes.
 BASE_DEPS = ['*** BEGIN CONDITION_IOS ***',
  '*** END CONDITION_IOS ***',
  '*** BEGIN //conditions:default ***',
  ':opts_sse4',
  ':opts_ssse3',
  '*** END //conditions:default ***',
  '*** BEGIN CONDITION_ANDROID ***',
  '*** END CONDITION_ANDROID ***']
@@ skipping 69 matching lines @@
  'include/core/SkPaint.h',
  'include/core/SkPath.h',
  'include/core/SkPathEffect.h',
  'include/core/SkPathMeasure.h',
  'include/core/SkPathRef.h',
  'include/core/SkPicture.h',
  'include/core/SkPictureRecorder.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',
  'include/core/SkPreConfig.h',
  'include/core/SkRRect.h',
  'include/core/SkRSXform.h',
  'include/core/SkRasterizer.h',
  'include/core/SkRect.h',
  'include/core/SkRefCnt.h',
  'include/core/SkRegion.h',
@@ skipping 788 matching lines @@
  'src/gpu/batches/GrAADistanceFieldPathRenderer.cpp',
  'src/gpu/batches/GrAADistanceFieldPathRenderer.h',
  'src/gpu/batches/GrAAFillRectBatch.cpp',
  'src/gpu/batches/GrAAFillRectBatch.h',
  'src/gpu/batches/GrAAHairLinePathRenderer.cpp',
  'src/gpu/batches/GrAAHairLinePathRenderer.h',
  'src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp',
  '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',
  'src/gpu/batches/GrCopySurfaceBatch.cpp',
  'src/gpu/batches/GrCopySurfaceBatch.h',
  'src/gpu/batches/GrDashLinePathRenderer.cpp',
  'src/gpu/batches/GrDashLinePathRenderer.h',
  'src/gpu/batches/GrDefaultPathRenderer.cpp',
  'src/gpu/batches/GrDefaultPathRenderer.h',
  'src/gpu/batches/GrDiscardBatch.h',
  'src/gpu/batches/GrDrawAtlasBatch.cpp',
  'src/gpu/batches/GrDrawAtlasBatch.h',
  'src/gpu/batches/GrDrawBatch.cpp',
  'src/gpu/batches/GrDrawBatch.h',
  'src/gpu/batches/GrDrawPathBatch.cpp',
  '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',
  'src/gpu/batches/GrNonAAStrokeRectBatch.h',
  'src/gpu/batches/GrRectBatchFactory.cpp',
  'src/gpu/batches/GrRectBatchFactory.h',
  'src/gpu/batches/GrStencilAndCoverPathRenderer.cpp',
  'src/gpu/batches/GrStencilAndCoverPathRenderer.h',
  'src/gpu/batches/GrStencilPathBatch.h',
  'src/gpu/batches/GrTInstanceBatch.h',
@@ skipping 84 matching lines @@
  'src/gpu/gl/GrGLRenderTarget.cpp',
  'src/gpu/gl/GrGLRenderTarget.h',
  'src/gpu/gl/GrGLStencilAttachment.cpp',
  'src/gpu/gl/GrGLStencilAttachment.h',
  'src/gpu/gl/GrGLTexture.cpp',
  'src/gpu/gl/GrGLTexture.h',
  'src/gpu/gl/GrGLTextureRenderTarget.cpp',
  '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',
  'src/gpu/gl/GrGLVertexBuffer.h',
  'src/gpu/gl/SkGLContext.cpp',
  'src/gpu/gl/SkNullGLContext.cpp',
  'src/gpu/gl/builders/GrGLProgramBuilder.cpp',
  'src/gpu/gl/builders/GrGLProgramBuilder.h',
  'src/gpu/gl/builders/GrGLSLPrettyPrint.cpp',
  'src/gpu/gl/builders/GrGLShaderStringBuilder.cpp',
@@ skipping 39 matching lines @@
  'src/gpu/glsl/GrGLSLProcessorTypes.h',
  'src/gpu/glsl/GrGLSLProgramBuilder.cpp',
  'src/gpu/glsl/GrGLSLProgramBuilder.h',
  'src/gpu/glsl/GrGLSLProgramDataManager.h',
  'src/gpu/glsl/GrGLSLShaderBuilder.cpp',
  'src/gpu/glsl/GrGLSLShaderBuilder.h',
  'src/gpu/glsl/GrGLSLShaderVar.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',
  'src/gpu/glsl/GrGLSLXferProcessor.h',
  'src/gpu/glsl/GrGLSL_impl.h',
  'src/image/SkImage.cpp',
  'src/image/SkImagePriv.h',
  'src/image/SkImageShader.cpp',
  'src/image/SkImageShader.h',
  'src/image/SkImage_Base.h',
@@ skipping 348 matching lines @@
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  'src/ports/SkTLS_pthread.cpp',
  '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',
  'src/opts/SkBitmapFilter_opts_SSE2.h',
  'src/opts/SkBitmapProcState_opts_SSE2.cpp',
  'src/opts/SkBitmapProcState_opts_SSE2.h',
  'src/opts/SkBlitMask_opts.h',
  'src/opts/SkBlitRow_opts.h',
  'src/opts/SkBlitRow_opts_SSE2.cpp',
  'src/opts/SkBlitRow_opts_SSE2.h',
  'src/opts/SkBlurImageFilter_opts.h',
  'src/opts/SkColorCubeFilter_opts.h',
  'src/opts/SkColor_opts_SSE2.h',
  'src/opts/SkFloatingPoint_opts.h',
  'src/opts/SkMatrix_opts.h',
  'src/opts/SkMorphologyImageFilter_opts.h',
  'src/opts/SkNx_avx.h',
  'src/opts/SkNx_sse.h',
  'src/opts/SkOpts_avx.cpp',
  'src/opts/SkPx_none.h',
  'src/opts/SkPx_sse.h',
  'src/opts/SkTextureCompressor_opts.h',
  'src/opts/SkUtils_opts.h',
  'src/opts/SkXfermode_opts.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',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  'src/ports/SkTLS_pthread.cpp',
  'src/ports/SkTime_Unix.cpp',
  '*** END //conditions:default ***',
@@ skipping 43 matching lines @@
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  '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',
  'src/opts/SkBitmapProcState_opts_SSE2.cpp',
  'src/opts/SkBitmapProcState_opts_SSE2.h',
  'src/opts/SkBlitMask_opts.h',
  'src/opts/SkBlitRow_opts.h',
  'src/opts/SkBlitRow_opts_SSE2.cpp',
  'src/opts/SkBlitRow_opts_SSE2.h',
  'src/opts/SkBlurImageFilter_opts.h',
  'src/opts/SkColorCubeFilter_opts.h',
  'src/opts/SkColor_opts_SSE2.h',
  'src/opts/SkFloatingPoint_opts.h',
  'src/opts/SkMatrix_opts.h',
  'src/opts/SkMorphologyImageFilter_opts.h',
  'src/opts/SkNx_avx.h',
  'src/opts/SkNx_sse.h',
  'src/opts/SkOpts_avx.cpp',
  'src/opts/SkPx_none.h',
  'src/opts/SkPx_sse.h',
  'src/opts/SkTextureCompressor_opts.h',
  'src/opts/SkUtils_opts.h',
  'src/opts/SkXfermode_opts.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',
  'src/ports/SkOSFile_posix.cpp',
  'src/ports/SkOSFile_stdio.cpp',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  'src/ports/SkTLS_pthread.cpp',
  'src/ports/SkTime_Unix.cpp']
 COPTS = ['*** BEGIN CONDITION_IOS ***',
@@ skipping 211 matching lines @@
  'gm/morphology.cpp',
  'gm/multipicturedraw.cpp',
  'gm/nested.cpp',
  'gm/ninepatchstretch.cpp',
  'gm/nonclosedpaths.cpp',
  'gm/offsetimagefilter.cpp',
  'gm/ovals.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',
  'gm/pathopsinverse.cpp',
  'gm/pathopsskpclip.cpp',
  'gm/pathreverse.cpp',
  'gm/pdf_never_embed.cpp',
  'gm/peekpixels.cpp',
  'gm/perlinnoise.cpp',
  'gm/perspshaders.cpp',
@@ skipping 22 matching lines @@
  'gm/shadertext.cpp',
  'gm/shadertext2.cpp',
  'gm/shadertext3.cpp',
  'gm/shadows.cpp',
  'gm/shallowgradient.cpp',
  'gm/simpleaaclip.cpp',
  'gm/skbug1719.cpp',
  'gm/skbug_257.cpp',
  'gm/smallarc.cpp',
  'gm/smallimage.cpp',
+ 'gm/smallpaths.cpp',
  'gm/spritebitmap.cpp',
  'gm/srcmode.cpp',
  'gm/stlouisarch.cpp',
  'gm/stringart.cpp',
  'gm/strokefill.cpp',
  'gm/strokerect.cpp',
  'gm/strokerects.cpp',
  'gm/strokes.cpp',
  'gm/stroketext.cpp',
  'gm/surface.cpp',
@@ skipping 70 matching lines @@
  'tests/DataRefTest.cpp',
  'tests/DequeTest.cpp',
  'tests/DeviceLooperTest.cpp',
  'tests/DiscardableMemoryPoolTest.cpp',
  'tests/DiscardableMemoryTest.cpp',
  'tests/DrawBitmapRectTest.cpp',
  'tests/DrawFilterTest.cpp',
  'tests/DrawPathTest.cpp',
  'tests/DrawTextTest.cpp',
  'tests/DynamicHashTest.cpp',
+ 'tests/EGLImageTest.cpp',
  'tests/EmptyPathTest.cpp',
  'tests/ErrorTest.cpp',
  'tests/FillPathTest.cpp',
  'tests/FitsInTest.cpp',
  'tests/FloatingPointTextureTest.cpp',
  'tests/FontHostStreamTest.cpp',
  'tests/FontHostTest.cpp',
  'tests/FontMgrTest.cpp',
  'tests/FontNamesTest.cpp',
  'tests/FontObjTest.cpp',
@@ skipping 123 matching lines @@
  'tests/PathTest.cpp',
  'tests/PictureBBHTest.cpp',
  'tests/PictureShaderTest.cpp',
  'tests/PictureTest.cpp',
  'tests/PipeTest.cpp',
  'tests/PixelRefTest.cpp',
  'tests/Point3Test.cpp',
  'tests/PointTest.cpp',
  'tests/PremulAlphaRoundTripTest.cpp',
  'tests/QuickRejectTest.cpp',
+ 'tests/RRectInPathTest.cpp',
  'tests/RTConfRegistryTest.cpp',
  'tests/RTreeTest.cpp',
  'tests/RandomTest.cpp',
  'tests/ReadPixelsTest.cpp',
  'tests/ReadWriteAlphaTest.cpp',
  'tests/Reader32Test.cpp',
  'tests/RecordDrawTest.cpp',
  'tests/RecordOptsTest.cpp',
  'tests/RecordPatternTest.cpp',
  'tests/RecordReplaceDrawTest.cpp',
@@ skipping 32 matching lines @@
  'tests/SubsetPath.h',
  'tests/SurfaceTest.cpp',
  'tests/SwizzlerTest.cpp',
  'tests/TArrayTest.cpp',
  'tests/TDPQueueTest.cpp',
  'tests/TLSTest.cpp',
  'tests/TemplatesTest.cpp',
  'tests/TessellatingPathRendererTests.cpp',
  'tests/Test.cpp',
  'tests/Test.h',
+ 'tests/TestTest.cpp',
  'tests/TextBlobCacheTest.cpp',
  'tests/TextBlobTest.cpp',
  'tests/TextureCompressionTest.cpp',
  'tests/Time.cpp',
  'tests/TopoSortTest.cpp',
  'tests/TraceMemoryDumpTest.cpp',
  'tests/TracingTest.cpp',
  'tests/TypefaceTest.cpp',
  'tests/UnicodeTest.cpp',
  'tests/UtilsTest.cpp',
@@ skipping 38 matching lines @@
  'include/utils/mac',
  'include/utils/win',
  'include/svg',
  'include/xml',
  'src/codec',
  'src/core',
  'src/gpu',
  'src/image',
  'src/lazy',
  'src/opts',
+ 'src/ports',
  'src/pdf',
  'src/sfnt',
  'src/utils',
  'third_party/etc1',
  'third_party/ktx']
 LINKOPTS = ['*** BEGIN //conditions:default ***',
  '-ldl',
  '*** END //conditions:default ***',
  '*** BEGIN CONDITION_ANDROID ***',
  '-ldl',
  '-lEGL',
  '*** END CONDITION_ANDROID ***']
 SSE4_SRCS = ['src/opts/SkBlitRow_opts_SSE4.cpp', 'src/opts/SkOpts_sse41.cpp']
 SSSE3_SRCS = ['src/opts/SkBitmapProcState_opts_SSSE3.cpp', 'src/opts/SkOpts_ssse3.cpp']