From 19fe8f0b419ec8105eb2f4ad505649d3cbb1ebb9 Mon Sep 17 00:00:00 2001 From: "hbono@chromium.org" Date: Tue, 7 Dec 2010 07:27:27 +0000 Subject: Integrates libjpeg-turbo into Chromium (Chromium side) This change is the Chromium-side change that integrates libjpeg-turbo into Chromium. (We need another change for WebKit.) It adds a GYP option 'libjpeg_turbo' so we can switch from libjpeg to libjpeg-turbo and use libjpeg-turbo when its value is 1. (Unfortunately, its value must be 0 for now to avoid build breaks until we land all changes required for libjpeg-turbo.) BUG=48789 TEST=build Chromium. Review URL: http://codereview.chromium.org/5292007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68453 0039d316-1c4b-4281-b951-d872f2087c98 --- app/app.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/app.gyp') diff --git a/app/app.gyp b/app/app.gyp index ce64955..1527c55 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -33,9 +33,9 @@ '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', - '../third_party/libjpeg/libjpeg.gyp:libjpeg', '../third_party/libpng/libpng.gyp:libpng', '../third_party/zlib/zlib.gyp:zlib', + '<(libjpeg_gyp_path):libjpeg', ], 'sources': [ 'animation_container_unittest.cc', -- cgit v1.1