diff options
| author | ensonic@google.com <ensonic@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 15:27:57 +0000 |
|---|---|---|
| committer | ensonic@google.com <ensonic@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 15:27:57 +0000 |
| commit | f30ef8065007c331cead59190a668f70fdca0171 (patch) | |
| tree | 65bede4fc604ae3933872fb48690fc9572ae6b02 /testing | |
| parent | 46a42bc6e3ca9b84396a79712518f96e585e414c (diff) | |
| download | chromium_src-f30ef8065007c331cead59190a668f70fdca0171.zip chromium_src-f30ef8065007c331cead59190a668f70fdca0171.tar.gz chromium_src-f30ef8065007c331cead59190a668f70fdca0171.tar.bz2 | |
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
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gtest.gyp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index cecd936..78b3ce2 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -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. @@ -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', @@ -48,6 +47,9 @@ 'gtest', 'gtest/include', ], + 'dependencies': [ + 'gtest_prod', + ], 'conditions': [ ['OS == "mac"', { 'sources': [ @@ -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', + ], + }, ], } |