diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 11:27:51 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 11:27:51 +0000 |
| commit | 7d2401e2d2d2d52c3c68222e1c158ae0d3519e19 (patch) | |
| tree | 808e08ad10ff2af0f9870a68b9f9376405c9e772 /third_party/protobuf/protobuf.gyp | |
| parent | af878c1efee3179361bd5a503933f6dd165e9ebf (diff) | |
| download | chromium_src-7d2401e2d2d2d52c3c68222e1c158ae0d3519e19.zip chromium_src-7d2401e2d2d2d52c3c68222e1c158ae0d3519e19.tar.gz chromium_src-7d2401e2d2d2d52c3c68222e1c158ae0d3519e19.tar.bz2 | |
third_party/protobuf: update to upstream r411.
1) Got an upstream diff 371:411 from svn
2) Pruned files from the diff that we don't have (e.g. java/).
3) Applied and fixed the merge failures.
4) Added new source files to the protobuf_lite target in protobuf.gyp.
This update is needed to pull the newly added atomicops which will help me get rid of static initializers.
BUG=none
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/9602008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/protobuf.gyp')
| -rw-r--r-- | third_party/protobuf/protobuf.gyp | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp index 67de315..dc6a642 100644 --- a/third_party/protobuf/protobuf.gyp +++ b/third_party/protobuf/protobuf.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -40,8 +40,10 @@ 'type': 'static_library', 'toolsets': ['host', 'target'], 'sources': [ + 'src/google/protobuf/stubs/atomicops.h', 'src/google/protobuf/stubs/common.h', 'src/google/protobuf/stubs/once.h', + 'src/google/protobuf/stubs/platform_macros.h', 'src/google/protobuf/extension_set.h', 'src/google/protobuf/generated_message_util.h', 'src/google/protobuf/message_lite.h', @@ -70,6 +72,36 @@ 'src/google/protobuf/io/zero_copy_stream_impl_lite.cc', '<(config_h_dir)/config.h', ], + 'conditions': [ + ['OS == "win"', { + 'sources+': [ + 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc', + 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h', + ], + }], + ['OS == "mac"', { + 'sources+': [ + 'src/google/protobuf/stubs/atomicops_internals_x86_macosx.h', + ], + }], + ['"<(target_arch)" == "arm"', { + 'sources+': [ + 'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h', + ], + }], + ['"<(target_arch)" == "mips"', { + 'sources+': [ + 'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h', + ], + }], + ['"<(target_arch)" == "ia32" or "<(target_arch)" == "x64"', { + 'sources+': [ + 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc', + 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h', + ], + }], + ], + 'include_dirs': [ '<(config_h_dir)', 'src', |