Commit 94d8222f by Jamie Madill Committed by Commit Bot

Vulkan: Disable layer deps for libANGLE in GYP.

This prevents a multiply defined symbol error in ninja. Unforunately I'm not aware of how to do the equivalent of GN's data_deps in GYP. BUG=angleproject:1709 Change-Id: I9c616337c668a5fa652b6c084b2a64d83d526e4a Reviewed-on: https://chromium-review.googlesource.com/437646Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent b874fe96
...@@ -1113,13 +1113,15 @@ ...@@ -1113,13 +1113,15 @@
'dependencies': 'dependencies':
[ [
'glslang', 'glslang',
'VkLayer_core_validation', # Need to disable these to prevent multiply defined symbols with ninja.
'VkLayer_image', # TODO(jmadill): Figure out how to implement data_deps in gyp.
'VkLayer_object_tracker', # 'VkLayer_core_validation',
'VkLayer_parameter_validation', # 'VkLayer_image',
'VkLayer_swapchain', # 'VkLayer_object_tracker',
'VkLayer_threading', # 'VkLayer_parameter_validation',
'VkLayer_unique_objects', # 'VkLayer_swapchain',
# 'VkLayer_threading',
# 'VkLayer_unique_objects',
'vulkan_loader', 'vulkan_loader',
], ],
'export_dependent_settings': 'export_dependent_settings':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment