diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-01 15:57:58 +0100 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-01 16:20:25 +0100 |
| commit | aee1bf50ed6733635ac6ae7389657a4563a8a7f7 (patch) | |
| tree | ea4b6682069713725a8ca8418f1f5537e8ae840b | |
| parent | edc469353a41710cf12a78211b9bc88adc4be9fe (diff) | |
| download | qtwebengine-chromium-aee1bf50ed6733635ac6ae7389657a4563a8a7f7.tar.gz | |
Fix the build after the GL ES2 fix.
The patch was incomplete and didn't survive a clean build.
Change-Id: I86a5bc13755c0d028d53146eb1d0d708bf429dd9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | chromium/content/content_browser.gypi | 1 | ||||
| -rw-r--r-- | chromium/gpu/gpu.gyp | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chromium/content/content_browser.gypi b/chromium/content/content_browser.gypi index 22d857a4b22..8a37d91ba24 100644 --- a/chromium/content/content_browser.gypi +++ b/chromium/content/content_browser.gypi @@ -1234,6 +1234,7 @@ 'dependencies': [ 'browser/devtools/devtools_resources.gyp:devtools_resources', '../cc/cc.gyp:cc', + '../gpu/gpu.gyp:gpu_ipc', '../net/net.gyp:http_server', '../printing/printing.gyp:printing', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', diff --git a/chromium/gpu/gpu.gyp b/chromium/gpu/gpu.gyp index 73df723f42b..15996237f10 100644 --- a/chromium/gpu/gpu.gyp +++ b/chromium/gpu/gpu.gyp @@ -91,6 +91,9 @@ 'command_buffer_client', 'gles2_implementation', ], + 'export_dependent_settings': [ + 'command_buffer_client', + ], 'defines': [ 'GLES2_C_LIB_IMPLEMENTATION', ], @@ -116,6 +119,9 @@ 'command_buffer_client', 'gles2_implementation_client_side_arrays_no_check', ], + 'export_dependent_settings': [ + 'command_buffer_client', + ], 'sources': [ '<@(gles2_c_lib_source_files)', ], @@ -424,6 +430,9 @@ 'dependencies': [ 'command_buffer_common', ], + 'export_dependent_settings': [ + 'command_buffer_common', + ], }, { 'target_name': 'gpu_config', |