third_party/protobuf/protobuf.gyp - Issue 9706016: third_party/protobuf: update to upstream r412.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/protobuf.gyp

Issue 9706016: third_party/protobuf: update to upstream r412. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/README.chromium ('k') | third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/protobuf.gyp

diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp

index dc6a6424ede920156db297ad784701f37087b671..a0ab85a8e94ad2070f3e7cfd01449e0dcbe220ae 100644

--- a/third_party/protobuf/protobuf.gyp

+++ b/third_party/protobuf/protobuf.gyp

@@ -41,6 +41,13 @@

'toolsets': ['host', 'target'],

'sources': [

'src/google/protobuf/stubs/atomicops.h',

+ 'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',

+ 'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h',

+ 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',

+ 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h',

+ 'src/google/protobuf/stubs/atomicops_internals_x86_macosx.h',

+ 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',

+ 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',

'src/google/protobuf/stubs/common.h',

'src/google/protobuf/stubs/once.h',

'src/google/protobuf/stubs/platform_macros.h',

@@ -72,36 +79,6 @@

'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',