Chromium Code Reviews| Index: third_party/BUILD.gn |
| diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn |
| index 7f27327ea58dc43b09b9e9a1cd069d7a1f6c4bdf..16adbf70fd63e49fd7a4340237f29d9de04d1b44 100644 |
| --- a/third_party/BUILD.gn |
| +++ b/third_party/BUILD.gn |
| @@ -44,6 +44,7 @@ source_set("fx_freetype") { |
| 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", |
| ] |
| @@ -94,6 +95,7 @@ source_set("fx_agg") { |
| 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", |
| ] |
| @@ -118,9 +120,14 @@ source_set("fx_agg") { |
| config("fx_lcms2_warnings") { |
| if (is_clang) { |
| - # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this |
| - # library doesn't appear to have this problem. |
| - cflags = [ "-Wno-missing-braces" ] |
| + cflags = [ |
|
Lei Zhang
2015/11/06 04:26:32
I synced this to master
|
| + # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this |
| + # library doesn't appear to have this problem. |
| + "-Wno-missing-braces", |
| + |
| + # FindPrev() in cmsplugin.c is unused. |
| + "-Wno-unused-function", |
| + ] |
| } |
| } |
| @@ -129,6 +136,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", |
| ] |
| @@ -163,7 +171,8 @@ source_set("fx_lcms2") { |
| ] |
| } |
| -source_set("fx_libjpeg") { |
| +# This is only used for standalone builds. |
| +source_set("jpeg") { |
| configs -= [ "//build/config/compiler:chromium_code" ] |
| configs += [ |
| "//build/config/compiler:no_chromium_code", |