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 69 additions and 66 deletions
tests/tests.gyp
...@@ -42,69 +42,6 @@ ...@@ -42,69 +42,6 @@
'targets': 'targets':
[ [
{ {
'target_name': 'angle_internal_gtest',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'include_dirs':
[
'third_party/googletest',
'third_party/googletest/include',
],
'sources':
[
'third_party/googletest/src/gtest-all.cc',
],
'defines':
[
'_VARIADIC_MAX=10',
],
'all_dependent_settings':
{
'defines':
[
'_VARIADIC_MAX=10',
],
'include_dirs':
[
'third_party/googletest',
'third_party/googletest/include',
],
},
},
{
'target_name': 'angle_internal_gmock',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'include_dirs':
[
'third_party/googlemock',
'third_party/googlemock/include',
'third_party/googletest/include',
],
'sources':
[
'third_party/googlemock/src/gmock-all.cc',
],
'defines':
[
'_VARIADIC_MAX=10',
],
'all_dependent_settings':
{
'defines':
[
'_VARIADIC_MAX=10',
],
'include_dirs':
[
'third_party/googlemock',
'third_party/googlemock/include',
'third_party/googletest/include',
],
},
},
{
'target_name': 'angle_test_support', 'target_name': 'angle_test_support',
'type': 'none', 'type': 'none',
'conditions': 'conditions':
...@@ -138,11 +75,77 @@ ...@@ -138,11 +75,77 @@
[ [
['angle_standalone==1', ['angle_standalone==1',
{ {
# These same target names exist on the Chromium side,
# which is forbidden, so we make them conditional on
# ANGLE's standalone build.
'targets': 'targets':
[ [
# Hide these targets from Chromium, because it can't
# find our standalone copy of the gtest/gmock sources.
{
'target_name': 'angle_internal_gtest',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'include_dirs':
[
'third_party/googletest',
'third_party/googletest/include',
],
'sources':
[
'third_party/googletest/src/gtest-all.cc',
],
'defines':
[
'_VARIADIC_MAX=10',
],
'all_dependent_settings':
{
'defines':
[
'_VARIADIC_MAX=10',
],
'include_dirs':
[
'third_party/googletest',
'third_party/googletest/include',
],
},
},
{
'target_name': 'angle_internal_gmock',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'include_dirs':
[
'third_party/googlemock',
'third_party/googlemock/include',
'third_party/googletest/include',
],
'sources':
[
'third_party/googlemock/src/gmock-all.cc',
],
'defines':
[
'_VARIADIC_MAX=10',
],
'all_dependent_settings':
{
'defines':
[
'_VARIADIC_MAX=10',
],
'include_dirs':
[
'third_party/googlemock',
'third_party/googlemock/include',
'third_party/googletest/include',
],
},
},
# These same target names exist on the Chromium side,
# which is forbidden, so we make them conditional on
# ANGLE's standalone build.
{ {
'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