| Index: tools/BUILD.public.expected
|
| diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
|
| index 323d7a91051208b06b99d04b687b1fda31b1fc28..3bfd1dad135fb2c2f5543ce6a933fe4e935729d6 100644
|
| --- a/tools/BUILD.public.expected
|
| +++ b/tools/BUILD.public.expected
|
| @@ -17,11 +17,10 @@ DEFINES = ['*** BEGIN //conditions:default ***',
|
| 'SK_BUILD_FOR_ANDROID',
|
| 'SK_PNG_NO_INDEX_SUPPORTED',
|
| '*** END CONDITION_ANDROID ***',
|
| - 'SK_RELEASE',
|
| 'SK_USE_FLOATBITS',
|
| 'SK_USE_FREETYPE_EMBOLDEN',
|
| 'GOOGLE3']
|
| -DEFINES_ALL = ['SK_RELEASE', 'SK_USE_FLOATBITS', 'SK_USE_FREETYPE_EMBOLDEN', 'GOOGLE3']
|
| +DEFINES_ALL = ['SK_USE_FLOATBITS', 'SK_USE_FREETYPE_EMBOLDEN', 'GOOGLE3']
|
| DEFINES_ANDROID = ['SK_BUILD_FOR_ANDROID', 'SK_PNG_NO_INDEX_SUPPORTED']
|
| DEFINES_UNIX = ['SK_BUILD_FOR_UNIX', 'SK_SAMPLES_FOR_X']
|
| DEPS = ['*** BEGIN //conditions:default ***',
|
| @@ -1020,7 +1019,6 @@ SRCS = ['include/private/SkAtomics.h',
|
| 'src/codec/SkCodec_libpng.h',
|
| 'src/codec/SkCodec_wbmp.cpp',
|
| 'src/codec/SkCodec_wbmp.h',
|
| - 'src/codec/SkJpegCodec.cpp',
|
| 'src/codec/SkJpegCodec.h',
|
| 'src/codec/SkJpegDecoderMgr.cpp',
|
| 'src/codec/SkJpegDecoderMgr.h',
|
| @@ -1030,10 +1028,10 @@ SRCS = ['include/private/SkAtomics.h',
|
| 'src/codec/SkMaskSwizzler.h',
|
| 'src/codec/SkMasks.cpp',
|
| 'src/codec/SkMasks.h',
|
| + 'src/codec/SkSampledCodec.cpp',
|
| 'src/codec/SkSampledCodec.h',
|
| 'src/codec/SkSampler.cpp',
|
| 'src/codec/SkSampler.h',
|
| - 'src/codec/SkScaledCodec.cpp',
|
| 'src/codec/SkSwizzler.cpp',
|
| 'src/codec/SkSwizzler.h',
|
| 'src/codec/SkWebpAdapterCodec.cpp',
|
| @@ -1317,6 +1315,7 @@ SRCS = ['include/private/SkAtomics.h',
|
| 'src/core/SkTaskGroup.cpp',
|
| 'src/core/SkTaskGroup.h',
|
| 'src/core/SkTextBlob.cpp',
|
| + 'src/core/SkTextBlobRunIterator.h',
|
| 'src/core/SkTextFormatParams.h',
|
| 'src/core/SkTextMapStateProc.h',
|
| 'src/core/SkTextToPathIter.h',
|
| @@ -1698,7 +1697,6 @@ SRCS = ['include/private/SkAtomics.h',
|
| 'src/gpu/gl/GrGLPathRendering.h',
|
| 'src/gpu/gl/GrGLPrimitiveProcessor.cpp',
|
| 'src/gpu/gl/GrGLPrimitiveProcessor.h',
|
| - 'src/gpu/gl/GrGLProcessor.h',
|
| 'src/gpu/gl/GrGLProgram.cpp',
|
| 'src/gpu/gl/GrGLProgram.h',
|
| 'src/gpu/gl/GrGLProgramDataManager.cpp',
|
| @@ -1763,7 +1761,10 @@ SRCS = ['include/private/SkAtomics.h',
|
| 'src/gpu/glsl/GrGLSL.h',
|
| 'src/gpu/glsl/GrGLSLCaps.cpp',
|
| 'src/gpu/glsl/GrGLSLCaps.h',
|
| + 'src/gpu/glsl/GrGLSLProcessorTypes.h',
|
| + 'src/gpu/glsl/GrGLSLProgramDataManager.h',
|
| 'src/gpu/glsl/GrGLSLShaderVar.h',
|
| + 'src/gpu/glsl/GrGLSLTextureSampler.h',
|
| 'src/gpu/glsl/GrGLSL_impl.h',
|
| 'src/image/SkImage.cpp',
|
| 'src/image/SkImagePriv.h',
|
|
|