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

Unified Diff: libjpeg.gyp

Issue 10442041: Make the default to not use system lib for all builds (Closed) Base URL: http://git.chromium.org/chromium/deps/libjpeg_turbo.git@master
Patch Set: Created 8 years, 7 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
diff --git a/libjpeg.gyp b/libjpeg.gyp
index 92a1d212a72d193941752e48d72d9c2f72bb1ba1..f9dd9dd0123da5c20a8ed641cca771a21098850d 100644
--- a/libjpeg.gyp
+++ b/libjpeg.gyp
@@ -5,16 +5,8 @@
{
'variables': {
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
+ 'use_system_libjpeg%': 0,
'conditions': [
- [ 'chromeos == 1 or (os_posix == 1 and \
- OS != "mac" and OS != "linux" and OS != "android")', {
- # 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,
- }, { # chromeos != 1 and (os_posix != 1 or
- # OS == "mac" or OS == "linux" or OS == "android")
- 'use_system_libjpeg%': 0,
- }],
[ 'OS=="win"', {
'object_suffix': 'obj',
}, {
« 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