summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_renderer.gypi
diff options
context:
space:
mode:
authorsehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 17:45:03 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 17:45:03 +0000
commitc2dff4977f8dbd35fd467fb3785587cb634dd190 (patch)
tree5ee05f387a75d856d29895f06f0c64156754c9ff /chrome/chrome_renderer.gypi
parent5f6397ecb4c7bc92295adc8d21bd87e698ac5622 (diff)
downloadchromium_src-c2dff4977f8dbd35fd467fb3785587cb634dd190.zip
chromium_src-c2dff4977f8dbd35fd467fb3785587cb634dd190.tar.gz
chromium_src-c2dff4977f8dbd35fd467fb3785587cb634dd190.tar.bz2
Revert 34161 - Enable Pepper support by default, including building the test plugin.
This is needed because the NaCl plugin code that runs in the renderer needs to use Pepper APIs all the time, and NaCl support has been enabled by default for several months now. To cause an untrusted Pepper plugin to run in the renderer one needs to specify the internalpepper flag. I have also removed the enable_pepper flag from gyp. As the build of the GPU process was tied to this flag, I have renamed the flag to enable_gpu. TEST=none BUG=none Review URL: http://codereview.chromium.org/464074 TBR=sehr@google.com Review URL: http://codereview.chromium.org/475004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_renderer.gypi')
-rwxr-xr-xchrome/chrome_renderer.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index ebe31de..f1e7c36c 100755
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -148,7 +148,7 @@
],
},
'conditions': [
- ['enable_gpu==1', {
+ ['enable_pepper==1', {
'dependencies': [
'../gpu/gpu.gyp:gpu_plugin',
],