diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 03:21:14 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 03:21:14 +0000 |
| commit | d2139663640f674e7c56b1e139616c62c2b58885 (patch) | |
| tree | 9afede65658f12bd00bf6cbf416a66e33c7737f1 /build | |
| parent | 665112a28e524eed5892bc1eebb453ae3f0d64c3 (diff) | |
| download | chromium_src-d2139663640f674e7c56b1e139616c62c2b58885.zip chromium_src-d2139663640f674e7c56b1e139616c62c2b58885.tar.gz chromium_src-d2139663640f674e7c56b1e139616c62c2b58885.tar.bz2 | |
Re-enable the build of Pepper support by default (issue 464074, svn revision 34161).
There were problems building Skia and others for the 64-bit linux versions of the
Pepper test plugin, so I have disabled building that plugin except on Windows for now
and added a TODO.
One significant addition to the previous comment lines. The flag enable_gpu=1 now
causes the build definition ENABLE_GPU=1 to allow guarding of dependent code.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/481001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 7 | ||||
| -rw-r--r-- | build/common.gypi | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/build/all.gyp b/build/all.gyp index 9bdd75f..d39a730 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:*', ], }], @@ -103,6 +103,9 @@ '../third_party/bspatch/bspatch.gyp:*', '../third_party/cld/cld.gyp:*', '../tools/memory_watcher/memory_watcher.gyp:*', + # As of now Skia build has problems with Linux and/or 64 bits. + # TODO(sehr,brettw): Make this unconditional. + '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', ], }, { 'dependencies': [ diff --git a/build/common.gypi b/build/common.gypi index 0f42c37..8261c9e 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,8 +341,8 @@ ['chromeos==1 or toolkit_views==1', { 'defines': ['OS_CHROMEOS=1'], }], - ['enable_pepper==1', { - 'defines': ['ENABLE_PEPPER=1'], + ['enable_gpu==1', { + 'defines': ['ENABLE_GPU=1'], }], ['fastbuild!=0', { 'conditions': [ |