third_party/protobuf/BUILD.gn - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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/BUILD.gn

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month 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/BUILD ('k') | third_party/protobuf/CHANGES.txt » ('j') | third_party/protobuf/patches/0008-uninline_getemptystring_and_getemptystringalreadyinited.patch » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/BUILD.gn

diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn

index 84c916a651e8347ae93661d3056337fe4a060e7d..22522225b3d4b437b0da088567486631598df22a 100644

--- a/third_party/protobuf/BUILD.gn

+++ b/third_party/protobuf/BUILD.gn

@@ -52,6 +52,7 @@ protobuf_lite_sources = [

"src/google/protobuf/io/zero_copy_stream.h",

"src/google/protobuf/io/zero_copy_stream_impl_lite.cc",

"src/google/protobuf/io/zero_copy_stream_impl_lite.h",

+ "src/google/protobuf/has_bits.h",

"src/google/protobuf/map.h",

"src/google/protobuf/map_entry_lite.h",

"src/google/protobuf/map_field_lite.h",

@@ -65,10 +66,10 @@ protobuf_lite_sources = [

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

"src/google/protobuf/stubs/atomicops_internals_arm_qnx.h",

"src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h",

+ "src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h",

"src/google/protobuf/stubs/atomicops_internals_generic_gcc.h",

"src/google/protobuf/stubs/atomicops_internals_macosx.h",

"src/google/protobuf/stubs/atomicops_internals_mips_gcc.h",

- "src/google/protobuf/stubs/atomicops_internals_pnacl.h",

"src/google/protobuf/stubs/atomicops_internals_power.h",

"src/google/protobuf/stubs/atomicops_internals_ppc_gcc.h",

"src/google/protobuf/stubs/atomicops_internals_solaris.h",

@@ -452,6 +453,7 @@ if (current_toolchain == host_toolchain) {

"src/google/protobuf/compiler/java/java_message_lite.h",

"src/google/protobuf/compiler/java/java_name_resolver.cc",

"src/google/protobuf/compiler/java/java_name_resolver.h",

+ "src/google/protobuf/compiler/java/java_options.h",

"src/google/protobuf/compiler/java/java_primitive_field.cc",

"src/google/protobuf/compiler/java/java_primitive_field.h",

"src/google/protobuf/compiler/java/java_primitive_field_lite.cc",

@@ -512,6 +514,8 @@ if (current_toolchain == host_toolchain) {

"src/google/protobuf/compiler/objectivec/objectivec_oneof.h",

"src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",

"src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h",

+ "src/google/protobuf/compiler/php/php_generator.cc",

+ "src/google/protobuf/compiler/php/php_generator.h",

"src/google/protobuf/compiler/plugin.cc",

"src/google/protobuf/compiler/plugin.h",

"src/google/protobuf/compiler/plugin.pb.cc",