diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:27:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:27:52 +0000 |
| commit | 46dedb11925d4dad7833bc804ebb37e062463d11 (patch) | |
| tree | 24c81b492f6a3d090f57c340cf97d9bf89ae24a5 /skia | |
| parent | aee1dbdee8399a95bf2fcbbb6b78771ca5b83062 (diff) | |
| download | chromium_src-46dedb11925d4dad7833bc804ebb37e062463d11.zip chromium_src-46dedb11925d4dad7833bc804ebb37e062463d11.tar.gz chromium_src-46dedb11925d4dad7833bc804ebb37e062463d11.tar.bz2 | |
harfbuzz: merge harfbuzz and harfbuzz_interface libraries
Though we build two libraries here, we always use them together,
and it simplifies the gyp files to have one.
BUG=68551
TEST=compiles
Review URL: http://codereview.chromium.org/5986015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index f7f44d4..cf65d6d 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -610,7 +610,6 @@ '../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:freetype2', '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', - '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz_interface', '../third_party/icu/icu.gyp:icuuc', ], 'cflags': [ @@ -624,9 +623,11 @@ '../third_party/skia/src/ports/SkFontHost_FreeType_Subpixel.cpp', '../third_party/skia/src/core/SkFontHost.cpp', ], + # Export harfbuzz include paths to all downstream users of + # this library. TODO(evan): this is a temporary change + # until I get the dependencies fixed in WebKit. 'export_dependent_settings': [ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', - '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz_interface', ], 'defines': [ 'SK_SUPPORT_LCDTEXT', |