summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 04:04:56 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 04:04:56 +0000
commit699a94cd0f5560846eb23108f72a27743e788151 (patch)
treebe6037a1473f05aeda78fcd6612da91851b0f5f1 /o3d
parent86b51feac76352124d5cbafb8969e9536642bf98 (diff)
downloadchromium_src-699a94cd0f5560846eb23108f72a27743e788151.zip
chromium_src-699a94cd0f5560846eb23108f72a27743e788151.tar.gz
chromium_src-699a94cd0f5560846eb23108f72a27743e788151.tar.bz2
linux: use internal libjpeg for bots that don't have it
Review URL: http://codereview.chromium.org/549169 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/build/common_global.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/o3d/build/common_global.gypi b/o3d/build/common_global.gypi
index 411b146..3d1f374 100644
--- a/o3d/build/common_global.gypi
+++ b/o3d/build/common_global.gypi
@@ -13,6 +13,7 @@
'conditions': [
[ 'OS == "linux"', {
'use_system_zlib': 0,
+ 'use_system_libjpeg': 0,
}],
],
},