summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 17:06:43 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 17:06:43 +0000
commit4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8 (patch)
treeefafdd70c921591168a8cc34dff990f83c147916 /build
parentad301eb035b5610de22356cadaac3a3826ca3abe (diff)
downloadchromium_src-4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8.zip
chromium_src-4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8.tar.gz
chromium_src-4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8.tar.bz2
Revert 91859 - Porting ppapi_tests framework to postMessage.
Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl. I also added a gyp option: pepper_scripting. The default is that scripting is on in this CL, but it will make it easy to turn it off in local builds. Soon we'll switch the default to no scripting, and soon after we can remove the option entirely. BUG=82606 TEST=these tests Review URL: http://codereview.chromium.org/7312008 TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/7329024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi9
1 files changed, 0 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi
index c2c56cc..00a94d9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -348,11 +348,6 @@
# but that doesn't work as we'd like.
'msvs_debug_link_incremental%': '2',
- # TODO(dmichael): eliminate this when possible.
- # This flag, when 0, makes ppapi build without synchronous scripting
- # support in public interfaces. This is a temporary transitional option.
- 'pepper_scripting%': 1,
-
# Needed for some of the largest modules.
'msvs_debug_link_nonincremental%': '1',
@@ -723,10 +718,6 @@
['enable_flapper_hacks==1', {
'defines': ['ENABLE_FLAPPER_HACKS=1'],
}],
- ['pepper_scripting==0', {
- 'defines': ['PPAPI_INSTANCE_REMOVE_SCRIPTING',
- 'PPAPI_VAR_REMOVE_SCRIPTING'],
- }],
['fastbuild!=0', {
'conditions': [
# For Windows, we don't genererate debug information.