Switch ChromeOS Chromium login to use IJG libjpeg

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 7c3074be09facf41cc8c54de22d68318c69db168..d736b4cc97d3b0b7b6bd6db998a9423fa1254524 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -912,8 +912,6 @@
         ['chromeos==1', {
           'enable_basic_printing%': 0,
           'enable_print_preview%': 1,
-          # When building for ChromeOS we dont want Chromium to use libjpeg_turbo.
-          'use_libjpeg_turbo%': 0,
         }],
 
         # Do not enable the Settings App on ChromeOS.
@@ -1502,6 +1500,11 @@
     # Experiment: http://crbug.com/426914
     'envoy%': 0,
 
+    # Used to set libjpeg_gyp_path. Chrome OS ui/gfx/gfx.gyp uses the IJG path
+    # for robust login screen decoding.
+    'libjpeg_ijg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',

[Nico, 2015/05/05 18:05:42]

I think you need to say <(DEPTH) instead of .. in gypi files, so that this works
in all targets, not just targets one up

[Ed Baker, 2015/05/05 22:03:34]

Done.

+    'libjpeg_turbo_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
+
     'conditions': [
       ['buildtype=="Official"', {
         # Continue to embed build meta data in Official builds, basically the
@@ -1985,9 +1988,9 @@
       # library used by Chromium.
       ['use_system_libjpeg==1 or use_libjpeg_turbo==0', {
         # Configuration for using the system libjeg is here.
-        'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
+        'libjpeg_gyp_path': '<(libjpeg_ijg_gyp_path)',
       }, {
-        'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
+        'libjpeg_gyp_path': '<(libjpeg_turbo_gyp_path)',
       }],
 
       # Options controlling the use of GConf (the classic GNOME configuration