diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-30 13:04:57 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-30 13:04:57 -0700 |
| commit | 4f9ccbffdb3165bd8cc4587548081bd551c7980e (patch) | |
| tree | 23f38cef1b31490042d57f7d6de35188c2fdfa7d | |
| parent | 972b78dbde75ee8434f134da9d364bca926c4a8a (diff) | |
| download | pdfium-4f9ccbffdb3165bd8cc4587548081bd551c7980e.tar.xz | |
Merge to XFA: Add standard "Must be after no_chromium_code" comment in GN files.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1411563004 .
(cherry picked from commit 4793f674f29be8bf06a60672032e2e2df5164c8c)
Review URL: https://codereview.chromium.org/1415573006 .
| -rw-r--r-- | BUILD.gn | 3 | ||||
| -rw-r--r-- | third_party/BUILD.gn | 22 |
2 files changed, 23 insertions, 2 deletions
@@ -581,8 +581,7 @@ static_library("fxge") { configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code", - # As of this writing, this needs to be last to suppress a -Wswitch warning. - # https://crbug.com/547906 + # Must be after no_chromium_code for warning flags to be ordered correctly. ":fxge_warnings", ] diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 5814a7db97..7c31e569b3 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -30,11 +30,22 @@ static_library("bigint") { ] } +config("fx_freetype_warnings") { + visibility = [ ":*" ] + if (is_clang) { + # open_face_PS_from_sfnt_stream() and open_face_from_buffer() in + # ftbase.h are unused. + cflags = [ "-Wno-unused-function" ] + } +} + source_set("fx_freetype") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", "//third_party/pdfium:pdfium_config", + # Must be after no_chromium_code for warning flags to be ordered correctly. + ":fx_freetype_warnings", ] defines = [ "FT2_BUILD_LIBRARY" ] sources = [ @@ -69,11 +80,21 @@ source_set("fx_freetype") { ] } +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", "//third_party/pdfium:pdfium_config", + # Must be after no_chromium_code for warning flags to be ordered correctly. + ":fx_agg_warnings", ] sources = [ "agg23/agg_basics.h", @@ -107,6 +128,7 @@ source_set("fx_lcms2") { configs += [ "//build/config/compiler:no_chromium_code", "//third_party/pdfium:pdfium_config", + # Must be after no_chromium_code for warning flags to be ordered correctly. ":fx_lcms2_warnings", ] sources = [ |