diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 19:20:40 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 19:20:40 +0000 |
| commit | b3df0fff2f7e5c004fb7bc438c65d2a58ca06fc1 (patch) | |
| tree | 0c2357d180e79fd988c7128f874d62253a4aa018 /build/config | |
| parent | d6acaabdf3e5e791300b9d2a9458a46206ffac60 (diff) | |
| download | chromium_src-b3df0fff2f7e5c004fb7bc438c65d2a58ca06fc1.zip chromium_src-b3df0fff2f7e5c004fb7bc438c65d2a58ca06fc1.tar.gz chromium_src-b3df0fff2f7e5c004fb7bc438c65d2a58ca06fc1.tar.bz2 | |
GN build improvements, misc plus
Parameterize webrtc enabling.
Add use_seccomp_pbf flag
Add a webkit version target
Work on ui/base GN build, especially on Windows. This target is a mess (in GYP). This patch tries to make it make a bit more sense while fixing the errors I found.
Fix ui/gl target for non-Linux platform. A bunch of X11 stuff was not parameterized.
Add unscaled resources target
BUG=
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/287343006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config')
| -rw-r--r-- | build/config/BUILD.gn | 4 | ||||
| -rw-r--r-- | build/config/features.gni | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index 48a33ed..e0b2a2d 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -27,7 +27,6 @@ config("feature_flags") { "CHROMIUM_BUILD", "ENABLE_ONE_CLICK_SIGNIN", "ENABLE_REMOTING=1", - "ENABLE_WEBRTC=1", "ENABLE_CONFIGURATION_POLICY", "ENABLE_NOTIFICATIONS", "ENABLE_EGLIMAGE=1", @@ -124,6 +123,9 @@ config("feature_flags") { if (use_allocator != "tcmalloc") { defines += [ "NO_TCMALLOC" ] } + if (enable_webrtc) { + defines += [ "ENABLE_WEBRTC=1" ] + } } # Debug/release ---------------------------------------------------------------- diff --git a/build/config/features.gni b/build/config/features.gni index a0db6e6..f4ec0f8 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -47,3 +47,12 @@ if (is_android) { } else { enable_printing = 1 } + +# The seccomp-bpf sandbox is only supported on three architectures +# currently. +# Do not disable seccomp_bpf anywhere without talking to +# security@chromium.org! +use_seccomp_bpf = (is_linux || is_android) && + (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm") + +enable_webrtc = !is_ios |