third_party/protobuf: update to upstream r412.

third_party/protobuf/protobuf.gyp

 # Copyright (c) 2012 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.
 
 {
   'conditions': [
     ['OS!="win"', {
       'variables': {
         'config_h_dir':
           '.',  # crafted for gcc/linux.
@@ skipping 23 matching lines @@
     #
     #   option optimize_for = LITE_RUNTIME;
     #
     # to your .proto file.
     {
       'target_name': 'protobuf_lite',
       'type': 'static_library',
       'toolsets': ['host', 'target'],
       'sources': [
         'src/google/protobuf/stubs/atomicops.h',
+        'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',
+        'src/google/protobuf/stubs/atomicops_internals_mips_gcc.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_macosx.h',
+        'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
+        'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',
         'src/google/protobuf/stubs/common.h',
         'src/google/protobuf/stubs/once.h',
         'src/google/protobuf/stubs/platform_macros.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.h',
@@ skipping 11 matching lines @@
         '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',
       ],
-      'conditions': [
-        ['OS == "win"', {
-          'sources+': [
-            'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
-            'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',
-          ],
-        }],
-        ['OS == "mac"', {
-          'sources+': [
-            'src/google/protobuf/stubs/atomicops_internals_x86_macosx.h',
-          ],
-        }],
-        ['"<(target_arch)" == "arm"', {
-          'sources+': [
-            'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',
-          ],
-        }],
-        ['"<(target_arch)" == "mips"', {
-          'sources+': [
-            'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h',
-          ],
-        }],
-        ['"<(target_arch)" == "ia32" or "<(target_arch)" == "x64"', {
-          'sources+': [
-            'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
-            'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h',
-          ],
-        }],
-      ],
-
       'include_dirs': [
         '<(config_h_dir)',
         'src',
       ],
       # This macro must be defined to suppress the use of dynamic_cast<>,
       # which requires RTTI.
       'defines': [
         'GOOGLE_PROTOBUF_NO_RTTI',
       ],
 
@@ skipping 216 matching lines @@
   #     ],
   #     'dependencies': [
   #       'protoc#host',
   #     ],
   #     'sources': [
   #       'src/google/protobuf/descriptor.proto',
   #     ],
      },
   ],
 }