diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-14 15:08:10 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-17 11:49:22 +0000 |
| commit | 136a49c9cd5b974ff8d6410492d7e13ff1a74196 (patch) | |
| tree | f9fa6996e345f8b4f08ff38a22faa77e7d102733 | |
| parent | 29ddf740068f59718fd31dee97feac49b391b323 (diff) | |
| download | qtwebengine-chromium-136a49c9cd5b974ff8d6410492d7e13ff1a74196.tar.gz | |
<third_party/WebKit> FIXUP: Add missing dependency to khronos_headers
Explicitly add khronos.gyp:khronos_headers dependency instead of relying
on exports that regularly break QtWebEngineCore compilation.
Change-Id: I74da1b261dc3954502818950ae01a261b975a3a2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
4 files changed, 5 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/core/core.gyp b/chromium/third_party/WebKit/Source/core/core.gyp index 0d1bbaf2096..deacf9cb370 100644 --- a/chromium/third_party/WebKit/Source/core/core.gyp +++ b/chromium/third_party/WebKit/Source/core/core.gyp @@ -612,7 +612,6 @@ '../platform/blink_platform.gyp:blink_platform', '../wtf/wtf.gyp:wtf', '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', '<(DEPTH)/url/url.gyp:url_lib', diff --git a/chromium/third_party/WebKit/Source/modules/modules.gyp b/chromium/third_party/WebKit/Source/modules/modules.gyp index 7a1f87d6975..da86b355c4e 100644 --- a/chromium/third_party/WebKit/Source/modules/modules.gyp +++ b/chromium/third_party/WebKit/Source/modules/modules.gyp @@ -39,6 +39,7 @@ # GN version: //third_party/WebKit/Source/modules:modules 'target_name': 'modules', 'dependencies': [ + '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', '../config.gyp:config', diff --git a/chromium/third_party/WebKit/Source/platform/blink_platform.gyp b/chromium/third_party/WebKit/Source/platform/blink_platform.gyp index 07f187c3b68..08c04d3791e 100644 --- a/chromium/third_party/WebKit/Source/platform/blink_platform.gyp +++ b/chromium/third_party/WebKit/Source/platform/blink_platform.gyp @@ -40,6 +40,7 @@ 'type': '<(component)', 'variables': { 'enable_wexit_time_destructors': 1 }, 'dependencies': [ + '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', '../config.gyp:config', '../wtf/wtf.gyp:wtf', # FIXME: Can we remove the dependency on Skia? @@ -176,6 +177,7 @@ 'target_name': 'blink_platform', 'type': '<(component)', 'dependencies': [ + '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', '../config.gyp:config', '../wtf/wtf.gyp:wtf', 'blink_common', @@ -436,6 +438,7 @@ ['target_arch=="arm"', { 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', 'blink_common', ], 'hard_dependency': 1, diff --git a/chromium/third_party/WebKit/Source/web/web.gyp b/chromium/third_party/WebKit/Source/web/web.gyp index 91c2cbb65dd..4d73fab4766 100644 --- a/chromium/third_party/WebKit/Source/web/web.gyp +++ b/chromium/third_party/WebKit/Source/web/web.gyp @@ -54,6 +54,7 @@ 'type': '<(component)', 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ + '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', '../config.gyp:config', '../platform/blink_platform.gyp:blink_common', '../modules/modules.gyp:modules', |