Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: BUILD.gn

Issue 1421963005: Merge to XFA: The chromium_code whack-a-mole CLs. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | core/src/fxge/win32/fx_win32_device.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 87405575c76115aef7694cd19b9a7c612ffe5900..8c7e30cf031f706107468e087e4145516a3bfda6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -48,8 +48,22 @@ config("pdfium_config") {
"/wd4146",
"/wd4333",
"/wd4345",
+ "/wd4267",
+ # TODO(thestig): Fix all instances, remove this, pdfium:29
+ "/wd4245",
+ "/wd4310",
+ "/wd4389",
+ "/wd4701",
+ "/wd4702",
+ "/wd4706",
+ "/wd4800",
]
}
+
+ if (is_clang) {
+ # TODO(thestig): Fix all instances, remove this, pdfium:29
+ cflags += [ "-Wno-sign-compare" ]
+ }
}
static_library("pdfium") {
@@ -97,11 +111,7 @@ static_library("pdfium") {
]
libs = []
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
deps = [
"third_party:bigint",
@@ -172,11 +182,7 @@ source_set("test_support") {
"//v8/include",
]
}
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
# Targets below this are only visible within this file (and to the
@@ -193,11 +199,7 @@ static_library("fdrm") {
"core/src/fdrm/crypto/fx_crypt_aes.cpp",
"core/src/fdrm/crypto/fx_crypt_sha.cpp",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("fpdfdoc") {
@@ -226,11 +228,7 @@ static_library("fpdfdoc") {
"core/src/fpdfdoc/pdf_vt.h",
"core/src/fpdfdoc/tagged_int.h",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("fpdfapi") {
@@ -346,11 +344,7 @@ static_library("fpdfapi") {
"core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp",
"core/src/fpdfapi/fpdf_render/render_int.h",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("fpdftext") {
@@ -365,11 +359,7 @@ static_library("fpdftext") {
"core/src/fpdftext/unicodenormalizationdata.cpp",
"core/src/fpdftext/unicodenormalizationdata.h",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("fxcodec") {
@@ -443,17 +433,13 @@ static_library("fxcodec") {
"core/src/fxcodec/lgif/fx_gif.cpp",
"core/src/fxcodec/lgif/fx_gif.h",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
if (is_posix) {
# core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
# conversion to check that an address is 16-bit aligned (benign).
cflags_c = [ "-Wno-pointer-to-int-cast" ]
}
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
config("fxge_warnings") {
@@ -509,11 +495,7 @@ static_library("fxcrt") {
"core/src/fxcrt/plex.h",
"core/src/fxcrt/xml_int.h",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("fxge") {
@@ -579,12 +561,9 @@ static_library("fxge") {
"core/src/fxge/ge/text_int.h",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- # Must be after no_chromium_code for warning flags to be ordered correctly.
":fxge_warnings",
+ ":pdfium_config",
]
if (pdf_use_skia) {
@@ -634,11 +613,7 @@ static_library("fxedit") {
"fpdfsdk/src/fxedit/fxet_module.cpp",
"fpdfsdk/src/fxedit/fxet_pageobjs.cpp",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("pdfwindow") {
@@ -680,11 +655,7 @@ static_library("pdfwindow") {
"fpdfsdk/src/pdfwindow/PWL_Utils.cpp",
"fpdfsdk/src/pdfwindow/PWL_Wnd.cpp",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("javascript") {
@@ -745,11 +716,7 @@ static_library("javascript") {
} else {
sources += [ "fpdfsdk/src/javascript/JS_Runtime_Stub.cpp" ]
}
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("formfiller") {
@@ -774,11 +741,7 @@ static_library("formfiller") {
"fpdfsdk/src/formfiller/FFL_RadioButton.cpp",
"fpdfsdk/src/formfiller/FFL_TextField.cpp",
]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
static_library("fpdfxfa") {
@@ -1498,11 +1461,7 @@ test("pdfium_unittests") {
":test_support",
]
include_dirs = [ "." ]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
test("pdfium_embeddertests") {
@@ -1546,9 +1505,5 @@ test("pdfium_embeddertests") {
"//v8/include",
]
}
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- ":pdfium_config",
- "//build/config/compiler:no_chromium_code",
- ]
+ configs += [ ":pdfium_config" ]
}
« no previous file with comments | « no previous file | core/src/fxge/win32/fx_win32_device.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698