Clean up poppler code.
We're not actually using it.
BUG=skia:3362
DOCS_PREVIEW= https://skia.org/?cl=1002493002
Review URL: https://codereview.chromium.org/1002493002
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index bbd09a6..60dcccc 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -86,11 +86,6 @@
}, {
'os_posix%': 1,
}],
- [ 'skia_os in ["linux"]', {
- 'skia_poppler_enabled%': 1,
- }, {
- 'skia_poppler_enabled%': 0,
- }],
['"64" in skia_arch_type', {
'skia_arch_width%': 64,
}, {
@@ -224,7 +219,6 @@
'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
'skia_angle%': '<(skia_angle)',
- 'skia_poppler_enabled%': '<(skia_poppler_enabled)',
'skia_arch_width%': '<(skia_arch_width)',
'skia_arch_type%': '<(skia_arch_type)',
'skia_chrome_utils%': '<(skia_chrome_utils)',
diff --git a/gyp/dm.gyp b/gyp/dm.gyp
index c05826b..dc75729 100644
--- a/gyp/dm.gyp
+++ b/gyp/dm.gyp
@@ -25,11 +25,6 @@
'../dm/DMSrcSinkAndroid.cpp',
],
}],
- ['skia_poppler_enabled', {
- 'sources': [ '../src/utils/SkPDFRasterizer.cpp' ],
- 'defines': [ 'SK_BUILD_POPPLER' ],
- 'dependencies': [ 'poppler.gyp:*' ],
- }],
],
}]
}
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index fc528d4..ed6e97b 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -81,8 +81,7 @@
'libpng.gyp:libpng',
],
'includes': [
- # common freetype sources needed for both the base Skia build and the
- # libpoppler build for testing only
+ # TODO: merge this back in here?
'freetype.gypi',
],
'include_dirs': [
@@ -109,30 +108,5 @@
}],
],
},
- {
- 'target_name': 'freetype_poppler',
- 'type': 'static_library',
- 'standalone_static_library': 1,
- 'includes': [
- 'freetype.gypi',
- ],
- 'sources': [
- # additional components used by poppler
- '../third_party/externals/freetype/src/base/ftbdf.c',
- '../third_party/externals/freetype/src/base/ftpfr.c',
-
- '../third_party/externals/freetype/src/bdf/bdf.c',
- '../third_party/externals/freetype/src/cid/type1cid.c',
- '../third_party/externals/freetype/src/pcf/pcf.c',
- '../third_party/externals/freetype/src/pfr/pfr.c',
- '../third_party/externals/freetype/src/psaux/psaux.c',
- '../third_party/externals/freetype/src/type1/type1.c',
- '../third_party/externals/freetype/src/type42/type42.c',
- '../third_party/externals/freetype/src/winfonts/winfnt.c',
-
- '../third_party/externals/freetype/src/gzip/ftgzip.c',
- '../third_party/externals/freetype/src/lzw/ftlzw.c',
- ],
- },
],
}
diff --git a/gyp/poppler.gyp b/gyp/poppler.gyp
deleted file mode 100644
index 6b7685d..0000000
--- a/gyp/poppler.gyp
+++ /dev/null
@@ -1,15 +0,0 @@
-# Poppler, assuming it's been installed to the (Linux) system.
-{
- 'targets': [{
- 'target_name': 'poppler',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'libraries': [
- '-lpoppler-cpp',
- ],
- 'include_dirs': [
- '/usr/include/poppler/cpp',
- ],
- },
- }],
-}