third_party/protobuf/src/Makefile.am - 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/src/Makefile.am

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/src/Makefile.am

diff --git a/third_party/protobuf/src/Makefile.am b/third_party/protobuf/src/Makefile.am

index 1929c50e130790f179320a6f59db1f64b00b8e0d..db9e7af9e76205ecc93e32ebcba52c1094c43f62 100644

--- a/third_party/protobuf/src/Makefile.am

+++ b/third_party/protobuf/src/Makefile.am

@@ -40,9 +40,9 @@ MAINTAINERCLEANFILES = \

nobase_include_HEADERS = \

google/protobuf/stubs/atomicops.h \

google/protobuf/stubs/atomicops_internals_arm_gcc.h \

+ google/protobuf/stubs/atomicops_internals_macosx.h \

google/protobuf/stubs/atomicops_internals_mips_gcc.h \

google/protobuf/stubs/atomicops_internals_x86_gcc.h \

- google/protobuf/stubs/atomicops_internals_x86_macosx.h \

google/protobuf/stubs/atomicops_internals_x86_msvc.h \

google/protobuf/stubs/common.h \

google/protobuf/stubs/platform_macros.h \