Revert r214000 to reland r213996.
This adds a g_type_init() call to the beginning of the test, apparently needed for GLib version earlier than 2.36. Original change: linux: Avoid leak in PlatformFontPangoTest.FamilyList. Call FcFini() at the end of the test to prevent FontConfig from leaking memory. BUG=114750 TBR=sky@chromium.org,behdad@chromium.org Review URL: https://chromiumcodereview.appspot.com/20910002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@214638 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
5470af9bf3
Коммит
55058bd2b5
|
@ -782,29 +782,29 @@
|
|||
['_toolset=="target"', {
|
||||
'direct_dependent_settings': {
|
||||
'cflags': [
|
||||
'<!@(<(pkg-config) --cflags pangocairo)',
|
||||
'<!@(<(pkg-config) --cflags pangocairo pangoft2)',
|
||||
],
|
||||
},
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo)',
|
||||
'<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
|
||||
],
|
||||
'libraries': [
|
||||
'<!@(<(pkg-config) --libs-only-l pangocairo)',
|
||||
'<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
|
||||
],
|
||||
},
|
||||
}, {
|
||||
'direct_dependent_settings': {
|
||||
'cflags': [
|
||||
'<!@(pkg-config --cflags pangocairo)',
|
||||
'<!@(pkg-config --cflags pangocairo pangoft2)',
|
||||
],
|
||||
},
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(pkg-config --libs-only-L --libs-only-other pangocairo)',
|
||||
'<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
|
||||
],
|
||||
'libraries': [
|
||||
'<!@(pkg-config --libs-only-l pangocairo)',
|
||||
'<!@(pkg-config --libs-only-l pangocairo pangoft2)',
|
||||
],
|
||||
},
|
||||
}],
|
||||
|
|
Загрузка…
Ссылка в новой задаче