summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-07 07:27:27 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-07 07:27:27 +0000
commit19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9 (patch)
treeab2e30e4b8dfb9107213e35ae0cc4c63ef523ab0 /chrome/chrome.gyp
parent740bbbecd5b555f6320368cc22f5adb836e1d14d (diff)
downloadchromium_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 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 71fb193..8cc41a9 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1646,7 +1646,6 @@
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/iccjpeg/iccjpeg.gyp:*',
'../third_party/icu/icu.gyp:*',
- '../third_party/libjpeg/libjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libwebp/libwebp.gyp:*',
'../third_party/libxslt/libxslt.gyp:*',
@@ -1668,6 +1667,7 @@
'../sandbox/sandbox.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
'../v8/tools/gyp/v8.gyp:v8_shell',
+ '<(libjpeg_gyp_path):*',
],
'conditions': [
['win_use_allocator_shim==1', {