diff options
| author |  benjaminwagner <benjaminwagner@google.com> | 2015-10-29 13:40:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-29 13:40:28 -0700 |
| commit | 8a3760f8b2ce8ded477ba90dd8e1522b1df441b8 (patch) | |
| tree | db8aab8dc1df19b14be784e45c8da7bdcad3d0c6 /tools/BUILD.public.expected | |
| parent | c75be34b4600d3acb5b076e6545efb05cce4abe6 (diff) | |
For BUILD.public, let SkPreConfig.h set SK_RELEASE based on NDEBUG.
Use DumpStackTrace in SkASSERT in GOOGLE3.
There are extra assertions enabled in debug mode that cause RecordDraw_TextBounds to fail.
New include causes a naming conflict with global name "base".
Corresponding internal cl/106495354
No public API changes.
TBR=reed@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1423013004
Diffstat (limited to 'tools/BUILD.public.expected')
| -rw-r--r-- | tools/BUILD.public.expected | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected index 323d7a9105..3bfd1dad13 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', |