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

Unified Diff: libjpeg.gyp

Issue 6181005: Remove workaround for gyp issue 102 and use libjpeg_turbo on Linux.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: Created 9 years, 11 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libjpeg.gyp
===================================================================
--- libjpeg.gyp (revision 66929)
+++ libjpeg.gyp (working copy)
@@ -4,11 +4,13 @@
{
'variables': {
+ 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
'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,
}],
[ 'OS=="win"', {
@@ -16,13 +18,6 @@
}, {
'object_suffix': 'o',
}],
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
- # This is a workaround for GYP issue 102.
- # TODO(hbono): Delete this workaround when this issue is fixed.
- 'shared_generated_dir': '<(INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
- }, {
- 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
- }],
],
},
'conditions': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698