diff options
-rw-r--r-- | common_conditions.gypi | 11 | ||||
-rw-r--r-- | core.gypi | 1 | ||||
-rw-r--r-- | gpu.gypi | 5 | ||||
-rw-r--r-- | opts.gyp | 2 | ||||
-rw-r--r-- | skia_for_chromium_defines.gypi | 5 | ||||
-rw-r--r-- | tests.gypi | 1 |
6 files changed, 16 insertions, 9 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi index 77dd925..6ae76a6 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -31,6 +31,7 @@ 'AdditionalOptions': [ '/MP', ], }, 'VCLinkerTool': { + 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM on 32-bit builds." 'AdditionalDependencies': [ 'OpenGL32.lib', 'usp10.lib', @@ -411,6 +412,16 @@ }], ], }], + [ 'skia_sanitizer == "undefined"', { + 'cflags': [ '-fPIC' ], + 'cflags_cc!': ['-fno-rtti'], + 'target_conditions': [ + [ '_type == "executable"', { + 'cflags': [ '-fPIE' ], + 'ldflags': [ '-pie' ], + }], + ], + }], ], }], [ 'skia_clang_build', { @@ -7,7 +7,6 @@ # { 'sources': [ - '<(skia_src_path)/core/ARGB32_Clamp_Bilinear_BitmapShader.h', '<(skia_src_path)/core/SkAAClip.cpp', '<(skia_src_path)/core/SkAnnotation.cpp', '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', @@ -9,6 +9,7 @@ 'variables': { 'skgpu_sources': [ '<(skia_include_path)/gpu/GrBackendEffectFactory.h', + '<(skia_include_path)/gpu/GrCacheable.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', '<(skia_include_path)/gpu/GrConfig.h', @@ -20,13 +21,13 @@ '<(skia_include_path)/gpu/GrEffectUnitTest.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', + '<(skia_include_path)/gpu/GrGpuObject.h', '<(skia_include_path)/gpu/GrKey.h', '<(skia_include_path)/gpu/GrPaint.h', '<(skia_include_path)/gpu/GrPathRendererChain.h', '<(skia_include_path)/gpu/GrPoint.h', '<(skia_include_path)/gpu/GrRect.h', '<(skia_include_path)/gpu/GrRenderTarget.h', - '<(skia_include_path)/gpu/GrResource.h', '<(skia_include_path)/gpu/GrSurface.h', '<(skia_include_path)/gpu/GrTBackendEffectFactory.h', '<(skia_include_path)/gpu/GrTexture.h', @@ -78,6 +79,7 @@ '<(skia_src_path)/gpu/GrClipMaskManager.cpp', '<(skia_src_path)/gpu/GrGpu.cpp', '<(skia_src_path)/gpu/GrGpu.h', + '<(skia_src_path)/gpu/GrGpuObject.cpp', '<(skia_src_path)/gpu/GrGpuFactory.cpp', '<(skia_src_path)/gpu/GrIndexBuffer.h', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.cpp', @@ -107,7 +109,6 @@ '<(skia_src_path)/gpu/GrRenderTarget.cpp', '<(skia_src_path)/gpu/GrReducedClip.cpp', '<(skia_src_path)/gpu/GrReducedClip.h', - '<(skia_src_path)/gpu/GrResource.cpp', '<(skia_src_path)/gpu/GrResourceCache.cpp', '<(skia_src_path)/gpu/GrResourceCache.h', '<(skia_src_path)/gpu/GrStencil.cpp', @@ -48,7 +48,7 @@ 'opts_ssse3', ], 'sources': [ - '../src/opts/opts_check_SSE2.cpp', + '../src/opts/opts_check_x86.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index 1ec908e..8a6fb34 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -16,11 +16,6 @@ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_N32_NAME', - 'SK_SUPPORT_LEGACY_PROCXFERMODE', - 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', - 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', - 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', - 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', ], }, @@ -142,6 +142,7 @@ '../tests/Reader32Test.cpp', '../tests/RecordDrawTest.cpp', '../tests/RecordOptsTest.cpp', + '../tests/RecordPatternTest.cpp', '../tests/RecordTest.cpp', '../tests/RecorderTest.cpp', '../tests/RecordingTest.cpp', |