diff options
| author |  halcanary <halcanary@google.com> | 2015-08-12 07:39:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-12 07:39:33 -0700 |
| commit | e14c1fe04fc72ec9bcf55820b5c65a71d7d0a764 (patch) | |
| tree | a425dd8c2ecad136d8de0e0370d6b5429293a192 | |
| parent | 65cc3e46445a26aadd21f111e0d69fd18fd8aa11 (diff) | |
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
| -rw-r--r-- | gyp/pdf.gyp | 2 | ||||
| -rw-r--r-- | gyp/pdf.gypi | 3 | ||||
| -rw-r--r-- | gyp/skflate.gyp | 18 |
3 files changed, 4 insertions, 19 deletions
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp index 1e69d9164e..c294986c79 100644 --- 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 0c9cb0695d..6cce52eb17 100644 --- 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 index d3193a3a4a..0000000000 --- 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' ], - }, - ], -} |