Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3215)

Unified Diff: build/all.gyp

Issue 481001: Re-enable the build of Pepper support by default (issue 464074, svn revision ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 34162)
+++ build/all.gyp (working copy)
@@ -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': [
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698