Skip to content

A
angle
Commit de5f98cd by Jamie Madill Committed by Commit Bot
Options

gyp: Fix missing ENABLE defs in end2end_tests.

These defines are necessary for config filtering. BUG=angleproject:1660 Change-Id: I5bc32d8127023a0de32af75101eda13c5cdf849e Reviewed-on: https://chromium-review.googlesource.com/425090Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 4af4951f
Showing with 50 additions and 54 deletions
src/libGLESv2.gypi
...@@ -716,19 +716,6 @@ ...@@ -716,19 +716,6 @@
# have special D3D11 code for Debug runtime error message handling. # have special D3D11 code for Debug runtime error message handling.
'target_name': 'libANGLE_d3d11_config', 'target_name': 'libANGLE_d3d11_config',
'type': 'none', 'type': 'none',
'direct_dependent_settings':
{
'conditions':
[
['angle_enable_d3d11==1',
{
'defines':
[
'ANGLE_ENABLE_D3D11',
],
}],
],
},
'conditions': 'conditions':
[ [
['angle_enable_d3d11==1', ['angle_enable_d3d11==1',
...@@ -766,6 +753,52 @@ ...@@ -766,6 +753,52 @@
}, },
{ {
'target_name': 'libANGLE_renderer_config',
'type': 'none',
'direct_dependent_settings':
{
'conditions':
[
['angle_enable_d3d11==1',
{
'defines':
[
'ANGLE_ENABLE_D3D11',
],
}],
['angle_enable_d3d9==1',
{
'defines':
[
'ANGLE_ENABLE_D3D9',
],
}],
['angle_enable_gl==1',
{
'defines':
[
'ANGLE_ENABLE_OPENGL',
],
}],
['angle_enable_vulkan==1',
{
'defines':
[
'ANGLE_ENABLE_VULKAN',
],
}],
['angle_enable_null==1',
{
'defines':
[
'ANGLE_ENABLE_NULL',
],
}],
],
},
},
{
'target_name': 'libANGLE', 'target_name': 'libANGLE',
'type': 'static_library', 'type': 'static_library',
'dependencies': 'dependencies':
...@@ -775,6 +808,7 @@ ...@@ -775,6 +808,7 @@
'angle_common', 'angle_common',
'angle_image_util', 'angle_image_util',
'libANGLE_d3d11_config', 'libANGLE_d3d11_config',
'libANGLE_renderer_config',
], ],
'includes': [ '../gyp/common_defines.gypi', ], 'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs': 'include_dirs':
...@@ -796,6 +830,7 @@ ...@@ -796,6 +830,7 @@
[ [
'angle_common', 'angle_common',
'libANGLE_d3d11_config', 'libANGLE_d3d11_config',
'libANGLE_renderer_config',
], ],
'direct_dependent_settings': 'direct_dependent_settings':
{ {
...@@ -830,19 +865,8 @@ ...@@ -830,19 +865,8 @@
'DYLIB_INSTALL_NAME_BASE': '@rpath', 'DYLIB_INSTALL_NAME_BASE': '@rpath',
}, },
}], }],
['angle_enable_d3d9==1',
{
'defines':
[
'ANGLE_ENABLE_D3D9',
],
}],
['angle_enable_gl==1', ['angle_enable_gl==1',
{ {
'defines':
[
'ANGLE_ENABLE_OPENGL',
],
'conditions': 'conditions':
[ [
['angle_use_glx==1', ['angle_use_glx==1',
...@@ -854,20 +878,6 @@ ...@@ -854,20 +878,6 @@
}], }],
], ],
}], }],
['angle_enable_vulkan==1',
{
'defines':
[
'ANGLE_ENABLE_VULKAN',
],
}],
['angle_enable_null==1',
{
'defines':
[
'ANGLE_ENABLE_NULL',
],
}],
], ],
}, },
'conditions': 'conditions':
...@@ -885,10 +895,6 @@ ...@@ -885,10 +895,6 @@
[ [
'<@(libangle_d3d9_sources)', '<@(libangle_d3d9_sources)',
], ],
'defines':
[
'ANGLE_ENABLE_D3D9',
],
'link_settings': 'link_settings':
{ {
'msvs_settings': 'msvs_settings':
...@@ -932,10 +938,6 @@ ...@@ -932,10 +938,6 @@
[ [
'<@(libangle_gl_sources)', '<@(libangle_gl_sources)',
], ],
'defines':
[
'ANGLE_ENABLE_OPENGL',
],
'conditions': 'conditions':
[ [
['OS=="win"', ['OS=="win"',
...@@ -1042,10 +1044,6 @@ ...@@ -1042,10 +1044,6 @@
[ [
'vulkan_loader', 'vulkan_loader',
], ],
'defines':
[
'ANGLE_ENABLE_VULKAN',
],
'export_dependent_settings': 'export_dependent_settings':
[ [
'vulkan_loader', 'vulkan_loader',
...@@ -1057,10 +1055,6 @@ ...@@ -1057,10 +1055,6 @@
[ [
'<@(libangle_null_sources)', '<@(libangle_null_sources)',
], ],
'defines':
[
'ANGLE_ENABLE_NULL',
],
}], }],
['angle_build_winrt==0 and OS=="win"', ['angle_build_winrt==0 and OS=="win"',
{ {
......
src/tests/angle_end2end_tests.gypi
...@@ -115,6 +115,8 @@ ...@@ -115,6 +115,8 @@
'<(angle_path)/src/angle.gyp:angle_image_util', '<(angle_path)/src/angle.gyp:angle_image_util',
# We use the D3D11 config for enabling Debug runtime error logging. # We use the D3D11 config for enabling Debug runtime error logging.
'<(angle_path)/src/angle.gyp:libANGLE_d3d11_config', '<(angle_path)/src/angle.gyp:libANGLE_d3d11_config',
# This lets us filter test configs more intelligently.
'<(angle_path)/src/angle.gyp:libANGLE_renderer_config',
'<(angle_path)/src/angle.gyp:libEGL', '<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/angle.gyp:libGLESv2', '<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/src/tests/tests.gyp:angle_test_support', '<(angle_path)/src/tests/tests.gyp:angle_test_support',
......
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