From 8be557542973c786d1024a7bfb300df230f00464 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 17 Jun 2015 11:05:02 -0700
Subject: Merge to XFA: Move lcms2 into third_party

Original Review URL: https://codereview.chromium.org/1181943008.
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1187273006.
---
 third_party/third_party.gyp | 96 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 27 deletions(-)

(limited to 'third_party/third_party.gyp')

diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 8538001e7f..524416289e 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -20,33 +20,6 @@
         'bigint/BigUnsignedInABase.cc',
       ],
     },
-    {
-      'target_name': 'fx_agg',
-      'type': 'static_library',
-      'sources': [
-        'agg23/agg_basics.h',
-        'agg23/agg_clip_liang_barsky.h',
-        'agg23/agg_conv_dash.h',
-        'agg23/agg_conv_stroke.h',
-        'agg23/agg_curves.cpp',
-        'agg23/agg_curves.h',
-        'agg23/agg_path_storage.cpp',
-        'agg23/agg_path_storage.h',
-        'agg23/agg_rasterizer_scanline_aa.cpp',
-        'agg23/agg_rasterizer_scanline_aa.h',
-        'agg23/agg_renderer_scanline.h',
-        'agg23/agg_rendering_buffer.h',
-        'agg23/agg_scanline_u.h',
-        'agg23/agg_vcgen_dash.cpp',
-        'agg23/agg_vcgen_stroke.cpp',
-      ],
-      'conditions': [
-        ['os_posix==1', {
-          # library contains several enum vs non-enum conditionals.
-          'cflags': [ '-Wno-extra', ],
-        }],
-      ],
-    },
     {
       'target_name': 'freetype',
       'type': 'static_library',
@@ -87,6 +60,75 @@
         'freetype/src/cid/type1cid.c',
       ],
     },
+    {
+      'target_name': 'fx_agg',
+      'type': 'static_library',
+      'sources': [
+        'agg23/agg_basics.h',
+        'agg23/agg_clip_liang_barsky.h',
+        'agg23/agg_conv_dash.h',
+        'agg23/agg_conv_stroke.h',
+        'agg23/agg_curves.cpp',
+        'agg23/agg_curves.h',
+        'agg23/agg_path_storage.cpp',
+        'agg23/agg_path_storage.h',
+        'agg23/agg_rasterizer_scanline_aa.cpp',
+        'agg23/agg_rasterizer_scanline_aa.h',
+        'agg23/agg_renderer_scanline.h',
+        'agg23/agg_rendering_buffer.h',
+        'agg23/agg_scanline_u.h',
+        'agg23/agg_vcgen_dash.cpp',
+        'agg23/agg_vcgen_stroke.cpp',
+      ],
+      'conditions': [
+        ['os_posix==1', {
+          # library contains several enum vs non-enum conditionals.
+          'cflags': [ '-Wno-extra', ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'fx_lcms2',
+      'type': 'static_library',
+      'sources': [
+        'lcms2-2.6/include/lcms2.h',
+        'lcms2-2.6/include/lcms2_plugin.h',
+        'lcms2-2.6/src/cmscam02.c',
+        'lcms2-2.6/src/cmscgats.c',
+        'lcms2-2.6/src/cmscnvrt.c',
+        'lcms2-2.6/src/cmserr.c',
+        'lcms2-2.6/src/cmsgamma.c',
+        'lcms2-2.6/src/cmsgmt.c',
+        'lcms2-2.6/src/cmshalf.c',
+        'lcms2-2.6/src/cmsintrp.c',
+        'lcms2-2.6/src/cmsio0.c',
+        'lcms2-2.6/src/cmsio1.c',
+        'lcms2-2.6/src/cmslut.c',
+        'lcms2-2.6/src/cmsmd5.c',
+        'lcms2-2.6/src/cmsmtrx.c',
+        'lcms2-2.6/src/cmsnamed.c',
+        'lcms2-2.6/src/cmsopt.c',
+        'lcms2-2.6/src/cmspack.c',
+        'lcms2-2.6/src/cmspcs.c',
+        'lcms2-2.6/src/cmsplugin.c',
+        'lcms2-2.6/src/cmsps2.c',
+        'lcms2-2.6/src/cmssamp.c',
+        'lcms2-2.6/src/cmssm.c',
+        'lcms2-2.6/src/cmstypes.c',
+        'lcms2-2.6/src/cmsvirt.c',
+        'lcms2-2.6/src/cmswtpnt.c',
+        'lcms2-2.6/src/cmsxform.c',
+      ],
+      'conditions': [
+        ['os_posix==1', {
+          'cflags': [
+            '-Wno-main',
+            '-Wno-missing-braces',
+            '-Wno-unused',
+          ],
+        }],
+      ],
+    },
     {
       'target_name': 'pdfium_base',
       'type': 'none',
-- 
cgit v1.2.3