diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 4 | ||||
| -rw-r--r-- | build/common.gypi | 7 |
2 files changed, 4 insertions, 7 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:*', ], }], diff --git a/build/common.gypi b/build/common.gypi index 0f42c37..bbce33e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -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. |