diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 23:19:28 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 23:19:28 +0000 |
| commit | 7131920e66e04689d07de4cfee7ed12554307ce4 (patch) | |
| tree | 86d4deb0d9c7cfd460f336c862d680b255dfad42 /build/config | |
| parent | acda0ef3c7584b332255eb0f232ed0b147fe784d (diff) | |
| download | chromium_src-7131920e66e04689d07de4cfee7ed12554307ce4.zip chromium_src-7131920e66e04689d07de4cfee7ed12554307ce4.tar.gz chromium_src-7131920e66e04689d07de4cfee7ed12554307ce4.tar.bz2 | |
Roll pdfium, add GN build for pdf and pdfium.
Pdfium changes:
d68f9a3 Add GN build file for pdfium, rename GYP target.
f0a5576 fix two uninitialized reads
https://code.google.com/p/pdfium/issues/detail?id=9
https://code.google.com/p/pdfium/issues/detail?id=10
bb2b1e7 Use unsigned type for iteration to avoid int overflow.
62a7fd6 Wrong variable assignment in Pdfium.
In the GN build this separates out the no-exceptions flag since pdfium must be compiled with exceptions enabled.
Updates pdfium naming in GYP from fpdfsdk.
Removes src/pdf from .gitignore now that it is checked in.
BUG=
R=jam@chromium.org
Review URL: https://codereview.chromium.org/315313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config')
| -rw-r--r-- | build/config/BUILDCONFIG.gn | 14 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 1 | ||||
| -rw-r--r-- | build/config/gcc/BUILD.gn | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 22b9dca..3df338d 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -329,7 +329,15 @@ if (is_win) { "//build/config/win:sdk", "//build/config/win:unicode", ] -} else if (is_linux) { +} +if (is_posix) { + _native_compiler_configs += [ + "//build/config/gcc:no_exceptions", + "//build/config/gcc:symbol_visibility_hidden", + ] +} + +if (is_linux) { _native_compiler_configs += [ "//build/config/linux:sdk", ] } else if (is_mac) { _native_compiler_configs += [ "//build/config/mac:sdk", ] @@ -338,9 +346,7 @@ if (is_win) { } else if (is_android) { _native_compiler_configs += [ "//build/config/android:sdk", ] } -if (!is_win) { - _native_compiler_configs += [ "//build/config/gcc:symbol_visibility_hidden" ] -} + if (is_clang) { _native_compiler_configs += [ "//build/config/clang:find_bad_constructs", diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 4520f3a..de6de2b 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -58,7 +58,6 @@ config("compiler") { "-fno-strict-aliasing", # See http://crbug.com/32204 ] cflags_cc += [ - "-fno-exceptions", "-fno-threadsafe-statics", # Not exporting C++ inline functions can generally be applied anywhere # so we do so here. Normal function visibility is controlled by diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn index 8272d8a..d5b9ddb 100644 --- a/build/config/gcc/BUILD.gn +++ b/build/config/gcc/BUILD.gn @@ -35,3 +35,7 @@ config("executable_ldconfig") { ] } } + +config("no_exceptions") { + cflags_cc = [ "-fno-exceptions" ] +} |