commit 4db4adc0e154ee1e8ad7f0971fe90dc11349b9c0
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 26 20:04:54 2012 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 26 20:04:54 2012 +0000
tree d2e0abe23956b75f5bd61f75af2c7faad239e980
parent 9fee7ad4491234d55317a45d9782794ece013e62

Build libjpeg from source for all platforms

(We were already doing so on Mac and Windows.)
Review URL: https://codereview.appspot.com/5909067

git-svn-id: http://skia.googlecode.com/svn/trunk@3497 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/libjpeg.gyp

diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index 4480d51..b7ce7a8 100644
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -10,14 +10,7 @@
 
 {
   'variables': {
-    'conditions': [
-      [ 'os_posix == 1 and OS != "mac"', {
-        # Link to system .so since we already use it due to GTK.
-        'use_system_libjpeg%': 1,
-      }, {  # os_posix != 1 or OS == "mac"
-        'use_system_libjpeg%': 0,
-      }],
-    ],
+    'use_system_libjpeg%': 0,
   },
   'conditions': [
     ['use_system_libjpeg==0', {