Chromium Code Reviews| Index: app/app.gyp |
| =================================================================== |
| --- app/app.gyp (revision 67381) |
| +++ app/app.gyp (working copy) |
| @@ -33,7 +33,6 @@ |
| '../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', |
| ], |
| @@ -89,6 +88,15 @@ |
| }], |
| ], |
| }], |
| + ['libjpeg_turbo==1', { |
|
Mark Mentovai
2010/11/29 19:14:17
I wonder if we could make this more abstract inste
Hironori Bono
2010/11/30 09:28:09
Done. Thank you for noticing it. It makes this cha
|
| + 'dependencies': [ |
| + '../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', |
| + ], |
| + }, { |
| + 'dependencies': [ |
| + '../third_party/libjpeg/libjpeg.gyp:libjpeg', |
| + ], |
| + }], |
| ], |
| }, |
| { |