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 /third_party/protobuf | |
| 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 'third_party/protobuf')
| -rw-r--r-- | third_party/protobuf/protobuf.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp index c104f2d..6978150 100644 --- a/third_party/protobuf/protobuf.gyp +++ b/third_party/protobuf/protobuf.gyp @@ -37,7 +37,7 @@ # to your .proto file. { 'target_name': 'protobuf_lite', - 'type': '<(library)', + 'type': 'static_library', 'toolsets': ['host', 'target'], 'sources': [ 'src/google/protobuf/stubs/common.h', @@ -97,7 +97,7 @@ # DO NOT LINK AGAINST THIS TARGET IN CHROME CODE --agl { 'target_name': 'protobuf_full_do_not_use', - 'type': '<(library)', + 'type': 'static_library', 'toolsets': ['host','target'], 'sources': [ 'src/google/protobuf/descriptor.h', |