From 541726611d9e66f7bc790e6477c0507db0a07d9e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 9 Jan 2015 14:49:47 -0800 Subject: Fix GN build under chromium checkout. Original patch at https://codereview.chromium.org/817813004 This suppresses the fatal compilation warnings introduced by https://pdfium.googlesource.com/pdfium/+/e4fc5ced45c8fcfbe2487ec64eab036bc7d57602 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/804253005 --- third_party/BUILD.gn | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'third_party') diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 2c889afb0e..e6340c6401 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -11,6 +11,11 @@ group("third_party") { } static_library("bigint") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + "//third_party/pdfium:pdfium_config", + "//build/config/compiler:no_chromium_code", + ] sources = [ "bigint/BigInteger.hh", "bigint/BigIntegerLibrary.hh", @@ -26,11 +31,10 @@ static_library("bigint") { } static_library("freetype") { - defines = [ - "FT2_BUILD_LIBRARY", - ] - include_dirs = [ - "freetype/include", + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + "//third_party/pdfium:pdfium_config", + "//build/config/compiler:no_chromium_code", ] sources = [ "freetype/include/freetype.h", @@ -65,6 +69,11 @@ static_library("freetype") { } component("safemath") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + "//third_party/pdfium:pdfium_config", + "//build/config/compiler:no_chromium_code", + ] sources = [ "logging.h", "macros.h", -- cgit v1.2.3