diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-15 19:38:03 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-15 19:38:03 -0800 |
| commit | a76a6d8bcb76077fa248b64c5d64791dc8f23771 (patch) | |
| tree | 1ea7c74990f4ca926ca61f29fc63831e23303521 /third_party/third_party.gyp | |
| parent | 2991d8d171e917912fd250c3c8ed693568dc1d8c (diff) | |
| download | pdfium-a76a6d8bcb76077fa248b64c5d64791dc8f23771.tar.xz | |
XFA: Rename libpng to libpng16.chromium/2625chromium/2624
Otherwise this conflicts with Chromium's copy if the include paths just
happens to be in the wrong order. Since the two copies of libpng are of
different versions, we cannot use Chromium's copy.
TBR=tsepez@chromium.org,ochang@chromium.org
Review URL: https://codereview.chromium.org/1599513004 .
Diffstat (limited to 'third_party/third_party.gyp')
| -rw-r--r-- | third_party/third_party.gyp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index f653760c49..97deacf49c 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -269,28 +269,28 @@ 'target_name': 'fx_lpng', 'type': 'static_library', 'sources': [ - 'libpng/png.c', - 'libpng/png.h', - 'libpng/pngconf.h', - 'libpng/pngdebug.h', - 'libpng/pngerror.c', - 'libpng/pngget.c', - 'libpng/pnginfo.h', - 'libpng/pnglibconf.h', - 'libpng/pngmem.c', - 'libpng/pngpread.c', - 'libpng/pngpriv.h', - 'libpng/pngread.c', - 'libpng/pngrio.c', - 'libpng/pngrtran.c', - 'libpng/pngrutil.c', - 'libpng/pngset.c', - 'libpng/pngstruct.h', - 'libpng/pngtrans.c', - 'libpng/pngwio.c', - 'libpng/pngwrite.c', - 'libpng/pngwtran.c', - 'libpng/pngwutil.c', + 'libpng16/png.c', + 'libpng16/png.h', + 'libpng16/pngconf.h', + 'libpng16/pngdebug.h', + 'libpng16/pngerror.c', + 'libpng16/pngget.c', + 'libpng16/pnginfo.h', + 'libpng16/pnglibconf.h', + 'libpng16/pngmem.c', + 'libpng16/pngpread.c', + 'libpng16/pngpriv.h', + 'libpng16/pngread.c', + 'libpng16/pngrio.c', + 'libpng16/pngrtran.c', + 'libpng16/pngrutil.c', + 'libpng16/pngset.c', + 'libpng16/pngstruct.h', + 'libpng16/pngtrans.c', + 'libpng16/pngwio.c', + 'libpng16/pngwrite.c', + 'libpng16/pngwtran.c', + 'libpng16/pngwutil.c', ], }, { |