From 5a5473381495625fdf691f93be48497f4edf003d Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Thu, 19 May 2011 23:18:53 +0000 Subject: 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 --- testing/gmock.gyp | 4 ++-- testing/gtest.gyp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'testing') 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', ], -- cgit v1.1