diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 00:29:15 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 00:29:15 +0000 |
| commit | a25e36ecc653035fb06dc5a69b86eaceb18db6dd (patch) | |
| tree | c65098f119c93e78912f055988ddb633b2f24336 /skia/skia.gyp | |
| parent | e0911d55207719cc45b657ec710ff605a7b26f43 (diff) | |
| download | chromium_src-a25e36ecc653035fb06dc5a69b86eaceb18db6dd.zip chromium_src-a25e36ecc653035fb06dc5a69b86eaceb18db6dd.tar.gz chromium_src-a25e36ecc653035fb06dc5a69b86eaceb18db6dd.tar.bz2 | |
Revert r17575 and r17576. They are causing layout test errors.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 220b382..9c3ad85 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -358,6 +358,7 @@ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', #'../third_party/skia/src/ports/SkFontHost_android.cpp', #'../third_party/skia/src/ports/SkFontHost_ascender.cpp', + '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', '../third_party/skia/src/ports/SkFontHost_tables.cpp', #'../third_party/skia/src/ports/SkFontHost_gamma.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', @@ -562,6 +563,8 @@ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', + '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', '../third_party/skia/src/ports/SkFontHost_tables.cpp', '../third_party/skia/src/core/SkTypeface.cpp', ], @@ -589,12 +592,6 @@ '../third_party/skia/src/ports/SkFontHost_none.cpp', 'ext/SkTypeface_fake.cpp', ], - 'sources': [ - # http://code.google.com/p/chromium/wiki/LinuxSandboxIPC - 'ext/SkFontHost_fontconfig.cpp', - 'ext/SkFontHost_fontconfig_direct.cpp', - 'ext/SkFontHost_fontconfig_ipc.cpp', - ], 'export_dependent_settings': [ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz_interface', @@ -627,7 +624,6 @@ 'config', '../third_party/skia/include/core', '../third_party/skia/include/effects', - '../third_party/skia/include/ports', 'ext', ], }, |