third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 config("protobuf_config") {
   include_dirs = [ "src" ]
   defines = [
     "GOOGLE_PROTOBUF_NO_RTTI",
     "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
   ]
@@ skipping 34 matching lines @@
   "src/google/protobuf/extension_set.h",
   "src/google/protobuf/generated_message_util.cc",
   "src/google/protobuf/generated_message_util.h",
   "src/google/protobuf/io/coded_stream.cc",
   "src/google/protobuf/io/coded_stream.h",
   "src/google/protobuf/io/coded_stream_inl.h",
   "src/google/protobuf/io/zero_copy_stream.cc",
   "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",
   "src/google/protobuf/map_type_handler.h",
   "src/google/protobuf/message_lite.cc",
   "src/google/protobuf/message_lite.h",
   "src/google/protobuf/repeated_field.cc",
   "src/google/protobuf/repeated_field.h",
   "src/google/protobuf/stubs/atomicops.h",
   "src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h",
   "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",
   "src/google/protobuf/stubs/atomicops_internals_tsan.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_msvc.cc",
   "src/google/protobuf/stubs/atomicops_internals_x86_msvc.h",
   "src/google/protobuf/stubs/atomic_sequence_num.h",
   "src/google/protobuf/stubs/bytestream.cc",
@@ skipping 74 matching lines @@
     ":protobuf_config",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   deps = [
     "//build/config/sanitizers:deps",
   ]
 
+  if (is_android) {
+    libs = [ "log" ]  # Used by src/google/protobuf/stubs/common.cc
+  }
+
   cflags = protobuf_lite_cflags
 
   # Required for component builds. See http://crbug.com/172800.
   if (is_component_build) {
     public_configs += [ ":protobuf_use_dlls" ]
     defines = [ "LIBPROTOBUF_EXPORTS" ]
   }
 }
 
 # This is the full, heavy protobuf lib that's needed for c++ .protos that don't
@@ skipping 129 matching lines @@
     "src/google/protobuf/wire_format.cc",
     "src/google/protobuf/wire_format.h",
     "src/google/protobuf/wrappers.pb.cc",
     "src/google/protobuf/wrappers.pb.h",
   ]
 
   deps = [
     "//build/config/sanitizers:deps",
   ]
 
+  if (is_android) {
+    libs = [ "log" ]  # Used by src/google/protobuf/stubs/common.cc
+  }
+
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
 
     # Must be after no_chromium_code for warning flags to be ordered
     # correctly.
     ":protobuf_warnings",
   ]
   if (is_win) {
     configs -= [ "//build/config/win:lean_and_mean" ]
@@ skipping 120 matching lines @@
       "src/google/protobuf/compiler/java/java_message_builder_lite.cc",
       "src/google/protobuf/compiler/java/java_message_builder_lite.h",
       "src/google/protobuf/compiler/java/java_message_field.cc",
       "src/google/protobuf/compiler/java/java_message_field.h",
       "src/google/protobuf/compiler/java/java_message_field_lite.cc",
       "src/google/protobuf/compiler/java/java_message_field_lite.h",
       "src/google/protobuf/compiler/java/java_message_lite.cc",
       "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",
       "src/google/protobuf/compiler/java/java_primitive_field_lite.h",
       "src/google/protobuf/compiler/java/java_service.cc",
       "src/google/protobuf/compiler/java/java_service.h",
       "src/google/protobuf/compiler/java/java_shared_code_generator.cc",
       "src/google/protobuf/compiler/java/java_shared_code_generator.h",
       "src/google/protobuf/compiler/java/java_string_field.cc",
       "src/google/protobuf/compiler/java/java_string_field.h",
@@ skipping 14 matching lines @@
       "src/google/protobuf/compiler/javanano/javanano_helpers.cc",
       "src/google/protobuf/compiler/javanano/javanano_helpers.h",
       "src/google/protobuf/compiler/javanano/javanano_map_field.cc",
       "src/google/protobuf/compiler/javanano/javanano_map_field.h",
       "src/google/protobuf/compiler/javanano/javanano_message.cc",
       "src/google/protobuf/compiler/javanano/javanano_message.h",
       "src/google/protobuf/compiler/javanano/javanano_message_field.cc",
       "src/google/protobuf/compiler/javanano/javanano_message_field.h",
       "src/google/protobuf/compiler/javanano/javanano_primitive_field.cc",
       "src/google/protobuf/compiler/javanano/javanano_primitive_field.h",
+      "src/google/protobuf/compiler/js/embed.cc",
       "src/google/protobuf/compiler/js/js_generator.cc",
       "src/google/protobuf/compiler/js/js_generator.h",
+      "src/google/protobuf/compiler/js/well_known_types_embed.cc",
+      "src/google/protobuf/compiler/js/well_known_types_embed.h",
       "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_enum.h",
       "src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_enum_field.h",
       "src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_extension.h",
       "src/google/protobuf/compiler/objectivec/objectivec_field.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_field.h",
       "src/google/protobuf/compiler/objectivec/objectivec_file.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_file.h",
       "src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_generator.h",
       "src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_helpers.h",
       "src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_map_field.h",
       "src/google/protobuf/compiler/objectivec/objectivec_message.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_message.h",
       "src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
       "src/google/protobuf/compiler/objectivec/objectivec_message_field.h",
       "src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
       "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",
       "src/google/protobuf/compiler/plugin.pb.h",
       "src/google/protobuf/compiler/python/python_generator.cc",
       "src/google/protobuf/compiler/python/python_generator.h",
       "src/google/protobuf/compiler/ruby/ruby_generator.cc",
       "src/google/protobuf/compiler/ruby/ruby_generator.h",
       "src/google/protobuf/compiler/subprocess.cc",
       "src/google/protobuf/compiler/subprocess.h",
@@ skipping 33 matching lines @@
 
     cflags = protobuf_lite_cflags
 
     deps = [
       ":protoc_lib",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
     ]
   }
+
+  executable("js_embed") {
+    sources = [
+      "src/google/protobuf/compiler/js/embed.cc",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+  }
 }
 
 google_python_dir = "$root_out_dir/pyproto/google"
 
 copy("copy_google") {
   sources = [
     "__init__.py",
   ]
   outputs = [
     "$google_python_dir/{{source_file_part}}",
@@ skipping 65 matching lines @@
     ":copy_google_protobuf_internal",
     ":copy_six",
   ]
 
   # Targets that depend on this should depend on the copied data files.
   data = get_target_outputs(":copy_google")
   data += get_target_outputs(":copy_six")
   data += get_target_outputs(":copy_google_protobuf")
   data += get_target_outputs(":copy_google_protobuf_internal")
 }