Integrates libjpeg-turbo into Chromium (Chromium side)...

app/app.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO: remove this helper when we have loops in GYP
     'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py',],
     'chromium_code': 1,
     'grit_info_cmd': ['python', '../tools/grit/grit_info.py',],
@@ skipping 15 matching lines @@
       'dependencies': [
         'app_base',
         'app_resources',
         '../base/base.gyp:test_support_base',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../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',
       ],
       'sources': [
         'animation_container_unittest.cc',
         'animation_unittest.cc',
         'clipboard/clipboard_unittest.cc',
         'l10n_util_mac_unittest.mm',
         'l10n_util_unittest.cc',
         'multi_animation_unittest.cc',
@@ skipping 35 matching lines @@
         }],
         ['OS =="linux" or OS =="freebsd"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
+        ['libjpeg_turbo==1', {

[Mark Mentovai, 2010/11/29 19:14:17]

I wonder if we could make this more abstract instead of having to write it in
each .gyp file that wants libjpeg.

Can we define a variable in common.gypi named libjpeg_gyp_path and have it point
to libjpeg.gyp in either libjpeg or libjpeg_turbo?

[Hironori Bono, 2010/11/30 09:28:09]

Done. Thank you for noticing it. It makes this change much cleaner. :)

+          'dependencies': [
+            '../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+          ],
+        }, {
+          'dependencies': [
+            '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+          ],
+        }],
       ],
     },
     {
       'target_name': 'app_strings',
       'msvs_guid': 'AE9BF4A2-19C5-49D8-BB1A-F28496DD7051',
       'type': 'none',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
@@ skipping 111 matching lines @@
       }],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: