Commit f30ef806 authored by ensonic@google.com's avatar ensonic@google.com

Move gtest_prod.h into its own target so it can be correctly set as a...

Move gtest_prod.h into its own target so it can be correctly set as a dependent target for base and reused as a dependency in gtest.


R=brettw
BUG=105855
TEST=


Review URL: http://codereview.chromium.org/8201001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112701 0039d316-1c4b-4281-b951-d872f2087c98
parent 46a42bc6
...@@ -543,6 +543,7 @@ ...@@ -543,6 +543,7 @@
}, },
'dependencies': [ 'dependencies': [
'base_static', 'base_static',
'../testing/gtest.gyp:gtest_prod',
'../third_party/modp_b64/modp_b64.gyp:modp_b64', '../third_party/modp_b64/modp_b64.gyp:modp_b64',
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
], ],
......
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
'gtest/include/gtest/gtest-typed-test.h', 'gtest/include/gtest/gtest-typed-test.h',
'gtest/include/gtest/gtest.h', 'gtest/include/gtest/gtest.h',
'gtest/include/gtest/gtest_pred_impl.h', 'gtest/include/gtest/gtest_pred_impl.h',
'gtest/include/gtest/gtest_prod.h',
'gtest/include/gtest/internal/gtest-death-test-internal.h', 'gtest/include/gtest/internal/gtest-death-test-internal.h',
'gtest/include/gtest/internal/gtest-filepath.h', 'gtest/include/gtest/internal/gtest-filepath.h',
'gtest/include/gtest/internal/gtest-internal.h', 'gtest/include/gtest/internal/gtest-internal.h',
...@@ -48,6 +47,9 @@ ...@@ -48,6 +47,9 @@
'gtest', 'gtest',
'gtest/include', 'gtest/include',
], ],
'dependencies': [
'gtest_prod',
],
'conditions': [ 'conditions': [
['OS == "mac"', { ['OS == "mac"', {
'sources': [ 'sources': [
...@@ -130,5 +132,13 @@ ...@@ -130,5 +132,13 @@
'gtest/src/gtest_main.cc', 'gtest/src/gtest_main.cc',
], ],
}, },
{
'target_name': 'gtest_prod',
'toolsets': ['host', 'target'],
'type': 'none',
'sources': [
'gtest/include/gtest/gtest_prod.h',
],
},
], ],
} }
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