SkPDF: Move SkFlate into src/pdf (part 1/3)

Next, we change Chromium build files, then we do the actual move.

Review URL: https://codereview.chromium.org/1285913002

diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 1e69d9164ec2d819fb994bb90c1cdcc8e7bcb23b..c294986c79ab5a80260639eee9bf00d1ce35af39 100644 (file)
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -20,7 +20,7 @@
       'variables': { 'skia_pdf_use_sfntly%': 1, },
       'dependencies': [
         'skia_lib.gyp:skia_lib',
-        'skflate.gyp:skflate',
+        'zlib.gyp:zlib',
       ],
       'includes': [
         'pdf.gypi',

diff --git a/gyp/pdf.gypi b/gyp/pdf.gypi
index 0c9cb0695d3bdffdc0fb37a81e4f442ce8b39c03..6cce52eb1742b8280b4a5d6046c3aa7bca2548d0 100644 (file)
--- a/gyp/pdf.gypi
+++ b/gyp/pdf.gypi
@@ -11,6 +11,9 @@
 #
 {
     'sources': [
+        # TODO(halcanary): Move to <(skia_src_path)/pdf.
+        '<(skia_src_path)/core/SkFlate.cpp',
+
         '<(skia_src_path)/doc/SkDocument_PDF.cpp',
         '<(skia_src_path)/pdf/SkJpegInfo.cpp',
         '<(skia_src_path)/pdf/SkJpegInfo.h',

diff --git a/gyp/skflate.gyp b/gyp/skflate.gyp
deleted file mode 100644 (file)
index d3193a3..0000000
--- a/gyp/skflate.gyp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Target for including SkFlate.
-{
-  'targets': [
-    {
-      'target_name': 'skflate',
-      'type': 'static_library',
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-        'zlib.gyp:zlib',
-      ],
-      'sources': [ '../src/core/SkFlate.cpp' ],
-    },
-  ],
-}