| Index: third_party/protobuf/BUILD.gn
 | 
| diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
 | 
| index eddfc8a7a9cb393596c57a0874995993eaca2b4f..973672b94f7acdd2aa7c4b363d3b2afa53e5dbc0 100644
 | 
| --- a/third_party/protobuf/BUILD.gn
 | 
| +++ b/third_party/protobuf/BUILD.gn
 | 
| @@ -33,9 +33,7 @@ if (component_mode == "shared_library") {
 | 
|  # This condif should be applied to targets using generated code from the proto
 | 
|  # compiler. It sets up the include directories properly.
 | 
|  config("using_proto") {
 | 
| -  include_dirs = [
 | 
| -    "$root_gen_dir/protoc_out",
 | 
| -  ]
 | 
| +  include_dirs = [ "$root_gen_dir/protoc_out" ]
 | 
|  }
 | 
|  
 | 
|  protobuf_lite_sources = [
 | 
| @@ -139,7 +137,6 @@ source_set("protobuf_full") {
 | 
|      "src/google/protobuf/compiler/java/java_doc_comment.cc",
 | 
|      "src/google/protobuf/compiler/java/java_doc_comment.h",
 | 
|      "src/google/protobuf/compiler/parser.h",
 | 
| -
 | 
|      "src/google/protobuf/stubs/strutil.cc",
 | 
|      "src/google/protobuf/stubs/strutil.h",
 | 
|      "src/google/protobuf/stubs/substitute.cc",
 | 
| @@ -150,7 +147,6 @@ source_set("protobuf_full") {
 | 
|      "src/google/protobuf/stubs/structurally_valid.cc",
 | 
|      "src/google/protobuf/stubs/template_util.h",
 | 
|      "src/google/protobuf/stubs/type_traits.h",
 | 
| -
 | 
|      "src/google/protobuf/descriptor.cc",
 | 
|      "src/google/protobuf/descriptor.pb.cc",
 | 
|      "src/google/protobuf/descriptor_database.cc",
 | 
| @@ -162,6 +158,7 @@ source_set("protobuf_full") {
 | 
|      "src/google/protobuf/service.cc",
 | 
|      "src/google/protobuf/text_format.cc",
 | 
|      "src/google/protobuf/wire_format.cc",
 | 
| +
 | 
|      # This file pulls in zlib, but it's not actually used by protoc, so
 | 
|      # instead of compiling zlib for the host, let's just exclude this.
 | 
|      # "src/src/google/protobuf/io/gzip_stream.cc",
 | 
| 
 |