From 4db4adc0e154ee1e8ad7f0971fe90dc11349b9c0 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Mon, 26 Mar 2012 20:04:54 +0000 Subject: [PATCH] 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 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp index 4480d516f..b7ce7a811 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', {