third_party/protobuf/protobuf.gyp - Issue 10793026: Roll Protobuf r415:r423.

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 10793026: Roll Protobuf r415:r423. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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:

Index: third_party/protobuf/protobuf.gyp

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

index 438578582e026204672b200658804af62b51aa9b..7c55c249bb3727217044b7313788f8cafb001111 100644

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

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

@@ -42,10 +42,11 @@

'sources': [

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

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

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

+ 'src/google/protobuf/stubs/atomicops_internals_macosx.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',

« no previous file with comments | « third_party/protobuf/README.chromium ('k') | third_party/protobuf/src/Makefile.am » ('j') | no next file with comments »