Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/protobuf_lite.gypi

Index: third_party/protobuf/protobuf_lite.gypi
diff --git a/third_party/protobuf/protobuf_lite.gypi b/third_party/protobuf/protobuf_lite.gypi
index 4d7007a9dcff0957813c56de3578ff3b8a2ec97f..bbdc072715d40317accb90381f75ece670b2f742 100644
--- a/third_party/protobuf/protobuf_lite.gypi
+++ b/third_party/protobuf/protobuf_lite.gypi
@@ -4,90 +4,47 @@
 
 {
   'sources': [
-    'src/google/protobuf/arena.cc',
-    'src/google/protobuf/arena.h',
-    'src/google/protobuf/arenastring.cc',
-    'src/google/protobuf/arenastring.h',
-    'src/google/protobuf/descriptor.h',
-    'src/google/protobuf/descriptor.pb.h',
-    'src/google/protobuf/extension_set.cc',
-    'src/google/protobuf/extension_set.h',
-    'src/google/protobuf/generated_enum_reflection.h',
-    'src/google/protobuf/generated_enum_util.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/message.h',
-    'src/google/protobuf/message_lite.cc',
-    'src/google/protobuf/message_lite.h',
-    'src/google/protobuf/metadata.cc',
-    'src/google/protobuf/metadata.h',
-    'src/google/protobuf/repeated_field.cc',
-    'src/google/protobuf/repeated_field.h',
-    'src/google/protobuf/stubs/atomic_sequence_num.h',
     'src/google/protobuf/stubs/atomicops.h',
-    'src/google/protobuf/stubs/atomicops_internals_aix.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_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_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/bytestream.cc',
-    'src/google/protobuf/stubs/bytestream.h',
-    'src/google/protobuf/stubs/callback.h',
-    'src/google/protobuf/stubs/casts.h',
-    'src/google/protobuf/stubs/common.cc',
     'src/google/protobuf/stubs/common.h',
-    'src/google/protobuf/stubs/fastmem.h',
-    'src/google/protobuf/stubs/hash.h',
-    'src/google/protobuf/stubs/logging.h',
-    'src/google/protobuf/stubs/macros.h',
-    'src/google/protobuf/stubs/map_util.h',
-    'src/google/protobuf/stubs/mathlimits.h',
-    'src/google/protobuf/stubs/mutex.h',
-    'src/google/protobuf/stubs/once.cc',
     'src/google/protobuf/stubs/once.h',
     'src/google/protobuf/stubs/platform_macros.h',
-    'src/google/protobuf/stubs/port.h',
-    'src/google/protobuf/stubs/scoped_ptr.h',
-    'src/google/protobuf/stubs/status.cc',
-    'src/google/protobuf/stubs/status.h',
-    'src/google/protobuf/stubs/statusor.cc',
-    'src/google/protobuf/stubs/statusor.h',
-    'src/google/protobuf/stubs/stl_util.h',
-    'src/google/protobuf/stubs/stringpiece.cc',
-    'src/google/protobuf/stubs/stringpiece.h',
-    'src/google/protobuf/stubs/stringprintf.cc',
-    'src/google/protobuf/stubs/stringprintf.h',
-    'src/google/protobuf/stubs/strutil.cc',
-    'src/google/protobuf/stubs/strutil.h',
-    'src/google/protobuf/stubs/template_util.h',
-    'src/google/protobuf/stubs/time.cc',
-    'src/google/protobuf/stubs/time.h',
-    'src/google/protobuf/stubs/type_traits.h',
-    'src/google/protobuf/testing/googletest.h',
+    'src/google/protobuf/extension_set.h',
+    'src/google/protobuf/generated_message_util.h',
+    'src/google/protobuf/message_lite.h',
+    'src/google/protobuf/repeated_field.h',
     'src/google/protobuf/unknown_field_set.cc',
     'src/google/protobuf/unknown_field_set.h',
-    'src/google/protobuf/wire_format_lite.cc',
     'src/google/protobuf/wire_format_lite.h',
     'src/google/protobuf/wire_format_lite_inl.h',
+    'src/google/protobuf/io/coded_stream.h',
+    'src/google/protobuf/io/zero_copy_stream.h',
+    'src/google/protobuf/io/zero_copy_stream_impl_lite.h',
+
+    'src/google/protobuf/stubs/common.cc',
+    'src/google/protobuf/stubs/once.cc',
+    'src/google/protobuf/stubs/hash.h',
+    'src/google/protobuf/stubs/map-util.h',
+    'src/google/protobuf/extension_set.cc',
+    'src/google/protobuf/generated_message_util.cc',
+    'src/google/protobuf/message_lite.cc',
+    'src/google/protobuf/repeated_field.cc',
+    'src/google/protobuf/wire_format_lite.cc',
+    'src/google/protobuf/io/coded_stream.cc',
+    'src/google/protobuf/io/coded_stream_inl.h',
+    'src/google/protobuf/io/zero_copy_stream.cc',
+    'src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
+    '<(config_h_dir)/config.h',
   ],
   'include_dirs': [
+    '<(config_h_dir)',
     'src',
   ],
   # This macro must be defined to suppress the use of dynamic_cast<>,
@@ -95,10 +52,10 @@
   'defines': [
     'GOOGLE_PROTOBUF_NO_RTTI',
     'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
-    'HAVE_PTHREAD',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
+      '<(config_h_dir)',
       'src',
     ],
     'defines': [