diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 07:27:27 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 07:27:27 +0000 |
| commit | 19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9 (patch) | |
| tree | ab2e30e4b8dfb9107213e35ae0cc4c63ef523ab0 /third_party/iccjpeg | |
| parent | 740bbbecd5b555f6320368cc22f5adb836e1d14d (diff) | |
| download | chromium_src-19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9.zip chromium_src-19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9.tar.gz chromium_src-19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9.tar.bz2 | |
Integrates libjpeg-turbo into Chromium (Chromium side)
This change is the Chromium-side change that integrates libjpeg-turbo into Chromium. (We need another change for WebKit.) It adds a GYP option 'libjpeg_turbo' so we can switch from libjpeg to libjpeg-turbo and use libjpeg-turbo when its value is 1. (Unfortunately, its value must be 0 for now to avoid build breaks until we land all changes required for libjpeg-turbo.)
BUG=48789
TEST=build Chromium.
Review URL: http://codereview.chromium.org/5292007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/iccjpeg')
| -rw-r--r-- | third_party/iccjpeg/iccjpeg.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/iccjpeg/iccjpeg.gyp b/third_party/iccjpeg/iccjpeg.gyp index dfbeb50..ee79527 100644 --- a/third_party/iccjpeg/iccjpeg.gyp +++ b/third_party/iccjpeg/iccjpeg.gyp @@ -9,7 +9,7 @@ 'product_name': 'iccjpeg', 'type': '<(library)', 'dependencies': [ - '../libjpeg/libjpeg.gyp:libjpeg', + '<(libjpeg_gyp_path):libjpeg', ], 'sources': [ 'iccjpeg.c', |