diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:18:53 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:18:53 +0000 |
| commit | 5a5473381495625fdf691f93be48497f4edf003d (patch) | |
| tree | 71210a4a0d933a71bcaa0c25db7930af891cf1d8 /testing | |
| parent | ab0367457117bc9f408be8730074befa57f93e51 (diff) | |
| download | chromium_src-5a5473381495625fdf691f93be48497f4edf003d.zip chromium_src-5a5473381495625fdf691f93be48497f4edf003d.tar.gz chromium_src-5a5473381495625fdf691f93be48497f4edf003d.tar.bz2 | |
Globally replace <(library) with static_library
We provided <(library) as a variable to support a peculiar
build configuration on Linux. We no longer support that build
configuration, so we can simplify this code to no longer use
a variable.
Review URL: http://codereview.chromium.org/7051014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gmock.gyp | 4 | ||||
| -rw-r--r-- | testing/gtest.gyp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/gmock.gyp b/testing/gmock.gyp index 8f73cb6..57ef913 100644 --- a/testing/gmock.gyp +++ b/testing/gmock.gyp @@ -6,7 +6,7 @@ 'targets': [ { 'target_name': 'gmock', - 'type': '<(library)', + 'type': 'static_library', 'msvs_guid': 'F9D886ED-B09F-4B74-932F-D8E4691E6B7F', 'dependencies': [ 'gtest.gyp:gtest', @@ -51,7 +51,7 @@ }, { 'target_name': 'gmock_main', - 'type': '<(library)', + 'type': 'static_library', 'dependencies': [ 'gmock', ], diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 1a91ac5..c3116f1 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -6,7 +6,7 @@ 'targets': [ { 'target_name': 'gtest', - 'type': '<(library)', + 'type': 'static_library', 'msvs_guid': 'BFE8E2A7-3B3B-43B0-A994-3058B852DB8B', 'sources': [ 'gtest/include/gtest/gtest-death-test.h', @@ -123,7 +123,7 @@ }, { 'target_name': 'gtest_main', - 'type': '<(library)', + 'type': 'static_library', 'dependencies': [ 'gtest', ], |