summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/BUILD.gn64
-rw-r--r--third_party/third_party.gyp70
2 files changed, 70 insertions, 64 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index b97a7858ad..6a070f7074 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -86,40 +86,42 @@ static_library("fx_freetype") {
]
}
-config("fx_agg_warnings") {
- visibility = [ ":*" ]
- if (is_clang) {
- # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
- cflags = [ "-Wno-unused-function" ]
+if (!pdf_use_skia) {
+ config("fx_agg_warnings") {
+ visibility = [ ":*" ]
+ if (is_clang) {
+ # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
+ cflags = [ "-Wno-unused-function" ]
+ }
}
-}
-source_set("fx_agg") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- "../:pdfium_config",
+ source_set("fx_agg") {
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [
+ "//build/config/compiler:no_chromium_code",
+ "../:pdfium_config",
- # Must be after no_chromium_code for warning flags to be ordered correctly.
- ":fx_agg_warnings",
- ]
- 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",
- ]
+ # Must be after no_chromium_code for warning flags to be ordered correctly.
+ ":fx_agg_warnings",
+ ]
+ 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",
+ ]
+ }
}
config("fx_lcms2_warnings") {
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 41db3b28db..fae4c8f1f4 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -107,39 +107,6 @@
],
},
{
- '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' ],
- }],
- ],
- 'variables': {
- 'clang_warning_flags': [
- # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
- '-Wno-unused-function',
- ],
- },
- },
- {
'target_name': 'fx_lcms2',
'type': 'static_library',
'sources': [
@@ -439,5 +406,42 @@
},
],
}],
+ ['pdf_use_skia!=1', {
+ 'targets': [
+ {
+ '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', ],
+ }],
+ ],
+ 'variables': {
+ 'clang_warning_flags': [
+ # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
+ '-Wno-unused-function',
+ ],
+ },
+ },
+ ],
+ }],
],
}