diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 17:19:22 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 17:19:22 +0000 |
| commit | 5f6397ecb4c7bc92295adc8d21bd87e698ac5622 (patch) | |
| tree | 140bdcb6f5680147521296fabd1dafcb9159a892 /build/all.gyp | |
| parent | e5307cef6dcdc2ab5d4445cd57938dbf4d5e30c3 (diff) | |
| download | chromium_src-5f6397ecb4c7bc92295adc8d21bd87e698ac5622.zip chromium_src-5f6397ecb4c7bc92295adc8d21bd87e698ac5622.tar.gz chromium_src-5f6397ecb4c7bc92295adc8d21bd87e698ac5622.tar.bz2 | |
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 --internal-pepper 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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 9bdd75f..efd560b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -35,6 +35,7 @@ '../third_party/sqlite/sqlite.gyp:*', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', '../third_party/zlib/zlib.gyp:*', + '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', '../webkit/webkit.gyp:*', 'util/build_util.gyp:*', @@ -51,9 +52,8 @@ '../chrome_frame/chrome_frame.gyp:*', ], }], - ['enable_pepper==1', { + ['enable_gpu==1', { 'dependencies': [ - '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', '../gpu/gpu.gyp:*', ], }], |