diff options
| author | reed <reed@google.com> | 2015-02-12 07:42:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 15:43:45 +0000 |
| commit | 5727d3b35c59233abad35de832d8e82529a81048 (patch) | |
| tree | 034e429fa03b8684a14fc63ca35196ffab0945a1 /skia/BUILD.gn | |
| parent | 7a5f7055c7a3e4b0e6a678187bb92541c116ab76 (diff) | |
| download | chromium_src-5727d3b35c59233abad35de832d8e82529a81048.zip chromium_src-5727d3b35c59233abad35de832d8e82529a81048.tar.gz chromium_src-5727d3b35c59233abad35de832d8e82529a81048.tar.bz2 | |
Move flags out of gyp/gn and into SkUserConfig.h
This will help reduce the spew when building in verbose mode, as these
flags won't be part of the command-line.
BUG=
Review URL: https://codereview.chromium.org/916763004
Cr-Commit-Position: refs/heads/master@{#315982}
Diffstat (limited to 'skia/BUILD.gn')
| -rw-r--r-- | skia/BUILD.gn | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 029c830..c793e0b 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -136,15 +136,7 @@ config("skia_config") { defines = gypi_blink_skia_defines.blink_skia_defines defines += gypi_skia_defines.skia_for_chromium_defines - defines += [ - "SK_ENABLE_INST_COUNT=0", - "GR_GL_CUSTOM_SETUP_HEADER=\"GrGLConfig_chrome.h\"", - "SK_ENABLE_LEGACY_API_ALIASING=1", - "SK_ATTR_DEPRECATED=SK_NOTHING_ARG1", - "GR_GL_IGNORE_ES3_MSAA=0", - "SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT", - "SK_SUPPORT_LEGACY_GETTOTALCLIP", - ] + defines += [] if (component_mode == "shared_library") { defines += [ "SKIA_DLL" ] @@ -160,12 +152,6 @@ config("skia_config") { defines += [ "SK_SUPPORT_GPU=0" ] } - # For POSIX platforms, prefer the Mutex implementation provided by Skia - # since it does not generate static initializers. - if (is_posix) { - defines += [ "SK_USE_POSIX_THREADS" ] - } - if (is_android) { defines += [ "SK_BUILD_FOR_ANDROID", @@ -199,25 +185,7 @@ config("skia_library_config") { include_dirs += [ "//third_party/skia/include/utils/ios" ] } - defines = [ - #skia_export_defines ???) TODO - - # skia uses static initializers to initialize the serialization logic - # of its "pictures" library. This is currently not used in chrome; if - # it ever gets used the processes that use it need to call - # SkGraphics::Init(). - "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0", - - # Forcing the unoptimized path for the offset image filter in skia until - # all filters used in Blink support the optimized path properly - "SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION", - "IGNORE_ROT_AA_RECT_OPT", - "SK_IGNORE_BLURRED_RRECT_OPT", - - # this flag forces Skia not to use typographic metrics with GDI. - "SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS", - "SK_USE_DISCARDABLE_SCALEDIMAGECACHE", - ] + defines = [] if (component_mode == "shared_library") { defines += [ "SKIA_IMPLEMENTATION=1" ] |