summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 00:25:40 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 00:25:40 +0000
commit1b4209f4c56fbdb6fe72aca508e8aa1c534964d4 (patch)
tree4ada6319dde7c5a46d974cad0007e7332dff858f /build
parent047b4b5470ad1b7888c96c9314af78f41a87f387 (diff)
downloadchromium_src-1b4209f4c56fbdb6fe72aca508e8aa1c534964d4.zip
chromium_src-1b4209f4c56fbdb6fe72aca508e8aa1c534964d4.tar.gz
chromium_src-1b4209f4c56fbdb6fe72aca508e8aa1c534964d4.tar.bz2
Private Pepper extension for Flapper to allow TCP connections to be made
(from inside the renderer sandbox). (Only enabled on ChromeOS, since it opens a hole in the renderer. This should be revisited, with controls tightened, once Flapper runs out of process.) BUG=none TEST=none Review URL: http://codereview.chromium.org/5098002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi11
1 files changed, 11 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 5d3ef05..b26818f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -128,6 +128,13 @@
}, {
'linux_fpic%': 1,
}],
+
+ # Enable some hacks to support Flapper only on Chrome OS.
+ ['chromeos==1', {
+ 'enable_flapper_hacks%': 1,
+ }, {
+ 'enable_flapper_hacks%': 0,
+ }],
],
},
@@ -139,6 +146,7 @@
'toolkit_views%': '<(toolkit_views)',
'use_gnome_keyring%': '<(use_gnome_keyring)',
'linux_fpic%': '<(linux_fpic)',
+ 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
'inside_chromium_build%': '<(inside_chromium_build)',
@@ -488,6 +496,9 @@
['proprietary_codecs==1', {
'defines': ['USE_PROPRIETARY_CODECS'],
}],
+ ['enable_flapper_hacks==1', {
+ 'defines': ['ENABLE_FLAPPER_HACKS=1'],
+ }],
['fastbuild!=0', {
'conditions': [
# For Windows, we don't genererate debug information.