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

Unified Diff: BUILD.gn

Issue 432243002: Revert 'gn: cross-platform exception disable' (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 5 months 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 | no next file » | 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 f562c1ed0902586e59829252edf39e03d08a24d7..9ecd70830e27f2d220bebcbe05bf7bed6beede93 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -85,8 +85,9 @@ static_library("pdfium") {
libs = []
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
deps = [
@@ -137,8 +138,9 @@ static_library("fdrm") {
"core/src/fdrm/crypto/fx_crypt_sha.cpp",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -168,8 +170,9 @@ static_library("fpdfdoc") {
"core/src/fpdfdoc/tagged_int.h",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -294,8 +297,9 @@ static_library("fpdfapi") {
"core/src/fpdfapi/fpdf_render/render_int.h",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -311,8 +315,9 @@ static_library("fpdftext") {
"core/src/fpdftext/unicodenormalizationdata.cpp",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -479,8 +484,9 @@ static_library("fxcodec") {
"core/src/fxcodec/libjpeg/transupp.h",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
if (is_posix) {
# core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
@@ -532,8 +538,9 @@ static_library("fxcrt") {
"core/src/fxcrt/xml_int.h",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -639,8 +646,9 @@ static_library("fxge") {
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
if (pdf_use_skia) {
@@ -691,8 +699,9 @@ static_library("fxedit") {
"fpdfsdk/src/fxedit/fxet_pageobjs.cpp",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -736,8 +745,9 @@ static_library("pdfwindow") {
"fpdfsdk/src/pdfwindow/PWL_Wnd.cpp",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
@@ -788,8 +798,9 @@ static_library("javascript") {
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
include_dirs = [
"//v8",
@@ -808,8 +819,9 @@ static_library("jsapi") {
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
include_dirs = [
"//v8",
@@ -848,7 +860,8 @@ static_library("formfiller") {
"fpdfsdk/src/formfiller/FFL_Utils.cpp",
]
configs -= [ "//build/config/compiler:chromium_code" ]
- configs -= [ "//build/config/compiler:no_exceptions" ]
- configs += [ "//build/config/compiler:exceptions" ]
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ }
configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698