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

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files or targets should set chromium_code to 1 if they build
@@ skipping 122 matching lines @@
 
       # The system root for cross-compiles. Default: none.
       'sysroot%': '',
 
       # On Linux, we build with sse2 for Chromium builds.
       'disable_sse2%': 0,
 
       # Remoting compilation is enabled by default. Set to 0 to disable.
       'remoting%': 1,
 
+      # The relative path from 'src/third_party' to the GYP file of the JPEG

[Mark Mentovai, 2010/11/30 15:06:01]

This doesn’t need to be relative to src/third_party. Since it ends in _path, it
ought to work to just be relative to this file (common.gypi). GYP will figure
the rest out.

[Hironori Bono, 2010/12/03 09:32:16]

Done. Thank you for noticing it. (Such comments are helpful because I'm a GYP
beginner.)

+      # library used by Chromium. To use libjpeg-turbo instead of libjpeg, we
+      # need to change this variable to 'libjpeg_turbo/libjpeg.gyp'.
+      'libjpeg_gyp_path%': 'libjpeg/libjpeg.gyp',
+
       'library%': '<(library)',
 
       # Variable 'component' is for cases where we would like to build some
       # components as dynamic shared libraries but still need variable
       # 'library' for static libraries.
       # By default, component is set to whatever library is set to and
       # it can be overriden by the GYP command line or by ~/.gyp/include.gypi.
       'component%': '<(library)',
     },
 
     # Define branding and buildtype on the basis of their settings within the
     # variables sub-dict above, unless overridden.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
     'toolkit_views%': '<(toolkit_views)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
     'chromeos%': '<(chromeos)',
     'touchui%': '<(touchui)',
     'inside_chromium_build%': '<(inside_chromium_build)',
     'fastbuild%': '<(fastbuild)',
     'python_ver%': '<(python_ver)',
     'armv7%': '<(armv7)',
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
     'disable_sse2%': '<(disable_sse2)',
     'remoting%': '<(remoting)',
+    'libjpeg_gyp_path%': '<(libjpeg_gyp_path)',

[Mark Mentovai, 2010/11/30 15:06:01]

It still might be a good idea to have a condition to flip this to libjpeg-turbo
based on a use_libjpeg_turbo variable. I think it’s better to require the user
to set a variable to 1 than to require the user to set it to a specific path.

[Hironori Bono, 2010/12/03 09:32:16]

Done. I have added a 'use_libjpeg_turbo' variable and switch this
'libjpeg_gyp_path' according to the 'use_libjpeg_turbo' value. (I may be missing
something, though.)

     'library%': '<(library)',
     'component%': '<(component)',
 
     # The release channel that this build targets. This is used to restrict
     # channel-specific build options, like which installer packages to create.
     # The default is 'all', which does no channel-specific filtering.
     'channel%': 'all',
 
     # Override chromium_mac_pch and set it to 0 to suppress the use of
     # precompiled headers on the Mac.  Prefix header injection may still be
@@ skipping 1350 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: