diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-11-06 10:19:46 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-11-06 10:19:46 -0800 |
| commit | b3a8c21f42a588f80a849566bed6bcb1a82a50c6 (patch) | |
| tree | 1a25d3658188c5c737593b68c1c75349bb2d1908 /third_party | |
| parent | 371379dcdc2e277b626650064394d989e35c917f (diff) | |
| download | pdfium-b3a8c21f42a588f80a849566bed6bcb1a82a50c6.tar.xz | |
Merge to XFA: Fix incorrect paths in third_party.gyp.
Also, reorder the freetype srcs.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1431863006 .
(cherry picked from commit f1a7cd8c489e75abff7a2e952ea52f92142a5b88)
Review URL: https://codereview.chromium.org/1411983006 .
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/third_party.gyp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 6d1661526d..378b2058dc 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -47,14 +47,11 @@ 'freetype/include/freetype/ftmm.h', 'freetype/include/freetype/ftotval.h', 'freetype/include/freetype/ftoutln.h', - 'freetype/include/freetype/internal/freetype/ftobjs.h', - 'freetype/include/freetype/internal/freetype/ftstream.h', - 'freetype/include/freetype/internal/freetype/tttypes.h', + 'freetype/include/freetype/internal/ftobjs.h', + 'freetype/include/freetype/internal/ftstream.h', + 'freetype/include/freetype/internal/tttypes.h', 'freetype/include/freetype/tttables.h', 'freetype/include/ft2build.h', - 'freetype/src/cff/cffobjs.h', - 'freetype/src/cff/cfftypes.h', - 'freetype/src/cff/cff.c', 'freetype/src/base/ftbase.c', 'freetype/src/base/ftbitmap.c', 'freetype/src/base/ftglyph.c', @@ -62,6 +59,10 @@ 'freetype/src/base/ftlcdfil.c', 'freetype/src/base/ftmm.c', 'freetype/src/base/ftsystem.c', + 'freetype/src/cff/cff.c', + 'freetype/src/cff/cffobjs.h', + 'freetype/src/cff/cfftypes.h', + 'freetype/src/cid/type1cid.c', 'freetype/src/psaux/psaux.c', 'freetype/src/pshinter/pshinter.c', 'freetype/src/psnames/psmodule.c', @@ -70,7 +71,6 @@ 'freetype/src/smooth/smooth.c', 'freetype/src/truetype/truetype.c', 'freetype/src/type1/type1.c', - 'freetype/src/cid/type1cid.c', ], }, { |