Skip to content

Commit

Permalink
Move gtest_prod.h into its own target so it can be correctly set as a…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
ensonic@google.com committed Dec 2, 2011
1 parent 46a42bc commit f30ef80
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions base/base.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@
},
'dependencies': [
'base_static',
'../testing/gtest.gyp:gtest_prod',
'../third_party/modp_b64/modp_b64.gyp:modp_b64',
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
],
Expand Down
14 changes: 12 additions & 2 deletions testing/gtest.gyp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 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
# found in the LICENSE file.

Expand All @@ -17,7 +17,6 @@
'gtest/include/gtest/gtest-typed-test.h',
'gtest/include/gtest/gtest.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-filepath.h',
'gtest/include/gtest/internal/gtest-internal.h',
Expand Down Expand Up @@ -48,6 +47,9 @@
'gtest',
'gtest/include',
],
'dependencies': [
'gtest_prod',
],
'conditions': [
['OS == "mac"', {
'sources': [
Expand Down Expand Up @@ -130,5 +132,13 @@
'gtest/src/gtest_main.cc',
],
},
{
'target_name': 'gtest_prod',
'toolsets': ['host', 'target'],
'type': 'none',
'sources': [
'gtest/include/gtest/gtest_prod.h',
],
},
],
}

0 comments on commit f30ef80

Please sign in to comment.