diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 18:42:16 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 18:42:16 +0000 |
| commit | 04c2237ab573a58a81f83faa4444547d32f403cf (patch) | |
| tree | 439ed42e5b829eee39b6bb86fad16e2612025e4b | |
| parent | 193f946be6f110983d57cb1c6eacb9fffd0bdd91 (diff) | |
| download | chromium_src-04c2237ab573a58a81f83faa4444547d32f403cf.zip chromium_src-04c2237ab573a58a81f83faa4444547d32f403cf.tar.gz chromium_src-04c2237ab573a58a81f83faa4444547d32f403cf.tar.bz2 | |
Set SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 to tell skia to not use static initializers.
SK_ALLOW_STATIC_GLOBAL_INITIALIZERS was added to skia by caryclark@.
BUG=106984
TEST=none
TBR=caryclark
Review URL: http://codereview.chromium.org/8985009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115565 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | skia/skia.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 356e6ce..e6d65d3 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -483,6 +483,7 @@ #'../third_party/skia/src/ports/SkFontHost_none.cpp', '../third_party/skia/src/ports/SkFontHost_sandbox_none.cpp', '../third_party/skia/src/ports/SkFontHost_win.cpp', + '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp', #'../third_party/skia/src/ports/SkImageDecoder_CG.cpp', #'../third_party/skia/src/ports/SkImageDecoder_empty.cpp', #'../third_party/skia/src/ports/SkImageRef_ashmem.cpp', @@ -734,6 +735,12 @@ 'SK_DISABLE_FAST_AA_STROKE_RECT', 'SK_OLD_EMPTY_PATH_BEHAVIOR=1', 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)', + + # 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', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', |