Skip to content

A
angle
Commit 99a3a9b2 by Jamie Madill
Options

Hide gtest and gmock internal standalone targets.

Don't expose these on the Chromium (non-standalone) build. This fixes some missing file warnings for the msvs-ninja build. BUG=angle:928 BUG=459058 Change-Id: I8932c31223347358070955b33995a3e973c359b7 Reviewed-on: https://chromium-review.googlesource.com/253001Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarbratell at Opera <bratell@opera.com> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org>
parent 73941deb
Showing with 38 additions and 35 deletions
tests/tests.gyp
...@@ -42,6 +42,44 @@ ...@@ -42,6 +42,44 @@
'targets': 'targets':
[ [
{ {
'target_name': 'angle_test_support',
'type': 'none',
'conditions':
[
['angle_standalone==1',
{
'dependencies': [
'angle_internal_gmock',
'angle_internal_gtest',
],
},
{
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'all_dependent_settings':
{
'include_dirs':
[
'<(DEPTH)/testing/gmock/include',
'<(DEPTH)/testing/gtest/include',
],
},
}],
],
},
],
'conditions':
[
['angle_standalone==1',
{
'targets':
[
# Hide these targets from Chromium, because it can't
# find our standalone copy of the gtest/gmock sources.
{
'target_name': 'angle_internal_gtest', 'target_name': 'angle_internal_gtest',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
...@@ -104,45 +142,10 @@ ...@@ -104,45 +142,10 @@
], ],
}, },
}, },
{
'target_name': 'angle_test_support',
'type': 'none',
'conditions':
[
['angle_standalone==1',
{
'dependencies': [
'angle_internal_gmock',
'angle_internal_gtest',
],
},
{
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'all_dependent_settings':
{
'include_dirs':
[
'<(DEPTH)/testing/gmock/include',
'<(DEPTH)/testing/gtest/include',
],
},
}],
],
},
],
'conditions':
[
['angle_standalone==1',
{
# These same target names exist on the Chromium side, # These same target names exist on the Chromium side,
# which is forbidden, so we make them conditional on # which is forbidden, so we make them conditional on
# ANGLE's standalone build. # ANGLE's standalone build.
'targets':
[
{ {
'target_name': 'angle_unittests', 'target_name': 'angle_unittests',
'type': 'executable', 'type': 'executable',
......
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