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 /third_party/harfbuzz | |
| 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 'third_party/harfbuzz')
| -rw-r--r-- | third_party/harfbuzz/harfbuzz.gyp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp index c2ed2f6..308b170 100644 --- a/third_party/harfbuzz/harfbuzz.gyp +++ b/third_party/harfbuzz/harfbuzz.gyp @@ -8,6 +8,9 @@ 'target_name': 'harfbuzz', 'type': '<(library)', 'sources': [ + 'contrib/harfbuzz-freetype.c', + 'contrib/harfbuzz-unicode.c', + 'contrib/harfbuzz-unicode-tables.c', 'src/harfbuzz-buffer.c', 'src/harfbuzz-stream.c', 'src/harfbuzz-dump.c', @@ -27,32 +30,13 @@ 'src/harfbuzz-thai.c', ], 'include_dirs': [ - 'src', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'src', - ], - }, - 'dependencies': [ - '../../build/linux/system.gyp:freetype2', - ], - }, - { - 'target_name': 'harfbuzz_interface', - 'type': '<(library)', - 'sources': [ - 'contrib/harfbuzz-freetype.c', - 'contrib/harfbuzz-unicode.c', - 'contrib/harfbuzz-unicode-tables.c', - ], - 'include_dirs': [ - 'src', 'contrib', + 'src', ], 'direct_dependent_settings': { 'include_dirs': [ 'contrib', + 'src', ], }, 'dependencies': [ |