third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/BUILD.gn

Index: third_party/protobuf/BUILD.gn
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
index 84c916a651e8347ae93661d3056337fe4a060e7d..f59d1c8571a632e52f726c547035d8bc2e000d66 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",
@@ -163,6 +164,10 @@ component("protobuf_lite") {
     "//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.
@@ -312,6 +317,10 @@ static_library("protobuf_full") {
     "//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",
@@ -452,6 +461,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",
@@ -486,8 +496,11 @@ if (current_toolchain == host_toolchain) {
       "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",
@@ -512,6 +525,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",