Revert 213996 "linux: Avoid leak in PlatformFontPangoTest.Family..."
More details @ http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/29992/steps/ui_unittests/logs/stdio > 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 > > Review URL: https://chromiumcodereview.appspot.com/19695014 TBR=derat@chromium.org Review URL: https://codereview.chromium.org/20865002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@214000 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
6f0f4a58aa
Коммит
3d51ffebeb
|
@ -782,29 +782,29 @@
|
|||
['_toolset=="target"', {
|
||||
'direct_dependent_settings': {
|
||||
'cflags': [
|
||||
'<!@(<(pkg-config) --cflags pangocairo pangoft2)',
|
||||
'<!@(<(pkg-config) --cflags pangocairo)',
|
||||
],
|
||||
},
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
|
||||
'<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo)',
|
||||
],
|
||||
'libraries': [
|
||||
'<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
|
||||
'<!@(<(pkg-config) --libs-only-l pangocairo)',
|
||||
],
|
||||
},
|
||||
}, {
|
||||
'direct_dependent_settings': {
|
||||
'cflags': [
|
||||
'<!@(pkg-config --cflags pangocairo pangoft2)',
|
||||
'<!@(pkg-config --cflags pangocairo)',
|
||||
],
|
||||
},
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
|
||||
'<!@(pkg-config --libs-only-L --libs-only-other pangocairo)',
|
||||
],
|
||||
'libraries': [
|
||||
'<!@(pkg-config --libs-only-l pangocairo pangoft2)',
|
||||
'<!@(pkg-config --libs-only-l pangocairo)',
|
||||
],
|
||||
},
|
||||
}],
|
||||
|
|
Загрузка…
Ссылка в новой задаче