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: http://src.chromium.org/svn/trunk/src/build@34161 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
sehr@google.com 2009-12-09 17:19:22 +00:00
Родитель 70ee1734bb
Коммит 39017af51a
2 изменённых файлов: 4 добавлений и 7 удалений

Просмотреть файл

@ -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:*',
],
}],

Просмотреть файл

@ -162,8 +162,8 @@
# Whether to add the experimental build define.
'chrome_frame_define%': 0,
# Whether pepper APIs are enabled.
'enable_pepper%': 0,
# Whether GPU plugin build is enabled.
'enable_gpu%': 0,
# Whether usage of OpenMAX is enabled.
'enable_openmax%': 0,
@ -341,9 +341,6 @@
['chromeos==1 or toolkit_views==1', {
'defines': ['OS_CHROMEOS=1'],
}],
['enable_pepper==1', {
'defines': ['ENABLE_PEPPER=1'],
}],
['fastbuild!=0', {
'conditions': [
# Finally, for Windows, we simply turn on profiling.