Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1043)

Unified Diff: third_party/libjpeg/libjpeg.gyp

Issue 4994004: Linux: use internal copy of libjpeg by default with mangled symbol names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: leave chromeos alone Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libjpeg/jpeglibmangler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjpeg/libjpeg.gyp
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index 731a61cd2ea8905466d72ecfbf186b7299c6a17c..2e28b91dc077be96c2454956c7aca22a54c2b4ea 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -5,10 +5,11 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['chromeos==1 or OS=="freebsd" or OS=="openbsd"', {
# Link to system .so since we already use it due to GTK.
+ # See crbug.com/30288 and 31427 for why we skip OS=="linux" above.
'use_system_libjpeg%': 1,
- }, { # OS!="linux" and OS!="freebsd" and OS!="openbsd"
+ }, { # chromeos!=1 and OS!="freebsd" and OS!="openbsd"
'use_system_libjpeg%': 0,
}],
],
« no previous file with comments | « third_party/libjpeg/jpeglibmangler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698