| Index: third_party/protobuf/protobuf.gyp
|
| diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
|
| index f9a624fb7e23959dcab6b6ea9fabeb33bcf4eed5..c136f42898b0bad03ad3f26c212809cd089cc97c 100644
|
| --- a/third_party/protobuf/protobuf.gyp
|
| +++ b/third_party/protobuf/protobuf.gyp
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +# Copyright 2013 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.
|
|
|
| @@ -194,6 +194,20 @@
|
| ],
|
| # TODO(jschuh): http://crbug.com/167187 size_t -> int.
|
| 'msvs_disabled_warnings': [ 4267 ],
|
| + # On Win component builds, we must dynamically link protobuf_lite
|
| + # to targets that directly depend on it in order to avoid linker
|
| + # warning C4275: "non dll-interface class used as base for
|
| + # dll-interface class". See the "DLLs vs. static linking" section in
|
| + # third_party/protobuf/vsprojects/readme.txt.
|
| + 'conditions': [
|
| + ['OS=="win" and component=="shared_library"', {
|
| + 'defines': [
|
| + 'LIBPROTOBUF_EXPORTS',
|
| + 'LIBPROTOC_EXPORTS',
|
| + 'PROTOBUF_USE_DLLS',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| },
|
| # This is the full, heavy protobuf lib that's needed for c++ .proto's
|
|
|