From aee1bf50ed6733635ac6ae7389657a4563a8a7f7 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 1 Nov 2013 15:57:58 +0100 Subject: 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 --- chromium/content/content_browser.gypi | 1 + chromium/gpu/gpu.gyp | 9 +++++++++ 2 files changed, 10 insertions(+) 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', -- cgit v1.2.1