aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2014-11-17 06:26:21 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-11-17 06:26:21 -0800
commit693024300f79ff3fb497ddee1043b609ddf521a4 (patch)
tree119033821d2772592c977aeb6c831a270ee521c1 /gyp
parent73c250112026b84b38e6dc8c93e0cfc31918dc9d (diff)
move SkPDFD*.h from include to src
Diffstat (limited to 'gyp')
-rw-r--r--gyp/pdf.gyp3
-rw-r--r--gyp/pdf.gypi5
-rw-r--r--gyp/tools.gyp1
3 files changed, 3 insertions, 6 deletions
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 76b23bb3a7..b253fd8e97 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -14,7 +14,6 @@
'pdf.gypi',
],
'include_dirs': [
- '../include/pdf',
'../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
'../src/pdf',
'../src/utils', # needed to get SkBitSet.h
@@ -43,7 +42,7 @@
'SK_SUPPORT_PDF',
],
'include_dirs': [
- '../include/pdf',
+ '../include/core', # SkDocument.h
],
},
},
diff --git a/gyp/pdf.gypi b/gyp/pdf.gypi
index e4cb958e1c..31151108ef 100644
--- a/gyp/pdf.gypi
+++ b/gyp/pdf.gypi
@@ -7,17 +7,16 @@
#
{
'sources': [
- '<(skia_include_path)/pdf/SkPDFDevice.h',
- '<(skia_include_path)/pdf/SkPDFDocument.h',
-
'<(skia_src_path)/doc/SkDocument_PDF.cpp',
'<(skia_src_path)/pdf/SkPDFCatalog.cpp',
'<(skia_src_path)/pdf/SkPDFCatalog.h',
'<(skia_src_path)/pdf/SkPDFDevice.cpp',
+ '<(skia_src_path)/pdf/SkPDFDevice.h',
'<(skia_src_path)/pdf/SkPDFDeviceFlattener.cpp',
'<(skia_src_path)/pdf/SkPDFDeviceFlattener.h',
'<(skia_src_path)/pdf/SkPDFDocument.cpp',
+ '<(skia_src_path)/pdf/SkPDFDocument.h',
'<(skia_src_path)/pdf/SkPDFFont.cpp',
'<(skia_src_path)/pdf/SkPDFFont.h',
'<(skia_src_path)/pdf/SkPDFFontImpl.h',
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 23790a6a3f..fe0137b2a5 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -641,7 +641,6 @@
'<(skia_include_path)/gpu',
'<(skia_include_path)/images',
'<(skia_include_path)/pathops',
- '<(skia_include_path)/pdf',
'<(skia_include_path)/pipe',
'<(skia_include_path)/ports',
'<(skia_include_path)/svg',