Switching Skia to chromium's libjpeg-turbo

gyp/libjpeg.gyp

Index: gyp/libjpeg.gyp
diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index 73072948854ee6ae4d797599d1553d52ccd78c1b..56cee280b39d0ccd028862ba54cc5b9dfd9c8907 100644
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -28,102 +28,17 @@
         },
       ],
     }, { # skia_os != android
-      'conditions': [
-          ['use_system_libjpeg==0', {
-          'targets': [
-            {
-              'target_name': 'libjpeg',
-              'type': 'static_library',
-              'sources': [
-                # we currently build skia's version of libjpeg-turbo without
-                # SIMD optimizations for simplicity
-                '../third_party/externals/libjpeg/jsimd_none.c',
-
-                '../third_party/externals/libjpeg/jcapimin.c',
-                '../third_party/externals/libjpeg/jcapistd.c',
-                '../third_party/externals/libjpeg/jccoefct.c',
-                '../third_party/externals/libjpeg/jccolor.c',
-                '../third_party/externals/libjpeg/jcdctmgr.c',
-                '../third_party/externals/libjpeg/jchuff.c',
-                '../third_party/externals/libjpeg/jchuff.h',
-                '../third_party/externals/libjpeg/jcinit.c',
-                '../third_party/externals/libjpeg/jcmainct.c',
-                '../third_party/externals/libjpeg/jcmarker.c',
-                '../third_party/externals/libjpeg/jcmaster.c',
-                '../third_party/externals/libjpeg/jcomapi.c',
-                '../third_party/externals/libjpeg/jconfig.h',
-                '../third_party/externals/libjpeg/jcparam.c',
-                '../third_party/externals/libjpeg/jcphuff.c',
-                '../third_party/externals/libjpeg/jcprepct.c',
-                '../third_party/externals/libjpeg/jcsample.c',
-                '../third_party/externals/libjpeg/jdapimin.c',
-                '../third_party/externals/libjpeg/jdapistd.c',
-                '../third_party/externals/libjpeg/jdatadst.c',
-                '../third_party/externals/libjpeg/jdatasrc.c',
-                '../third_party/externals/libjpeg/jdcoefct.c',
-                '../third_party/externals/libjpeg/jdcolor.c',
-                '../third_party/externals/libjpeg/jdct.h',
-                '../third_party/externals/libjpeg/jddctmgr.c',
-                '../third_party/externals/libjpeg/jdhuff.c',
-                '../third_party/externals/libjpeg/jdhuff.h',
-                '../third_party/externals/libjpeg/jdinput.c',
-                '../third_party/externals/libjpeg/jdmainct.c',
-                '../third_party/externals/libjpeg/jdmarker.c',
-                '../third_party/externals/libjpeg/jdmaster.c',
-                '../third_party/externals/libjpeg/jdmerge.c',
-                '../third_party/externals/libjpeg/jdphuff.c',
-                '../third_party/externals/libjpeg/jdpostct.c',
-                '../third_party/externals/libjpeg/jdsample.c',
-                '../third_party/externals/libjpeg/jerror.c',
-                '../third_party/externals/libjpeg/jerror.h',
-                '../third_party/externals/libjpeg/jfdctflt.c',
-                '../third_party/externals/libjpeg/jfdctfst.c',
-                '../third_party/externals/libjpeg/jfdctint.c',
-                '../third_party/externals/libjpeg/jidctflt.c',
-                '../third_party/externals/libjpeg/jidctfst.c',
-                '../third_party/externals/libjpeg/jidctint.c',
-                '../third_party/externals/libjpeg/jidctred.c',
-                '../third_party/externals/libjpeg/jinclude.h',
-                '../third_party/externals/libjpeg/jmemmgr.c',
-                '../third_party/externals/libjpeg/jmemnobs.c',
-                '../third_party/externals/libjpeg/jmemsys.h',
-                '../third_party/externals/libjpeg/jmorecfg.h',
-                '../third_party/externals/libjpeg/jpegint.h',
-                '../third_party/externals/libjpeg/jpeglib.h',
-                '../third_party/externals/libjpeg/jpeglibmangler.h',
-                '../third_party/externals/libjpeg/jquant1.c',
-                '../third_party/externals/libjpeg/jquant2.c',
-                '../third_party/externals/libjpeg/jutils.c',
-                '../third_party/externals/libjpeg/jversion.h',
-              ],
-              'direct_dependent_settings': {
-                'include_dirs': [
-                  '../third_party/externals/libjpeg',
-                ],
-              },
-              'cflags': [
-                '-w', # supresses warnings
-              ],
-            },
+      'targets': [
+        {
+          'target_name': 'libjpeg',
+          'type': 'none',
+          'dependencies': [
+            'libjpeg-turbo.gyp:*',
           ],
-        }, {  ## use_system_libjpeg != 0
-          'targets': [
-            {
-              'target_name': 'libjpeg',
-              'type': 'none',
-              'direct_dependent_settings': {
-                'defines': [
-                  'USE_SYSTEM_LIBJPEG',
-                ],
-              },
-              'link_settings': {
-                'libraries': [
-                  '-ljpeg',
-                ],
-              },
-            }
+          'export_dependent_settings': [
+            'libjpeg-turbo.gyp:*',
           ],
-        }],
+        },
       ],
     }],
   ],