Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1046)

Side by Side Diff: third_party/protobuf/protobuf.gyp

Issue 21208003: Update protobuf to r428, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['use_system_protobuf==0', { 7 ['use_system_protobuf==0', {
8 'conditions': [ 8 'conditions': [
9 ['OS!="win"', { 9 ['OS!="win"', {
10 'variables': { 10 'variables': {
11 'config_h_dir': 11 'config_h_dir':
12 '.', # crafted for gcc/linux. 12 '.', # crafted for gcc/linux.
13 }, 13 },
14 }, { # else, OS=="win" 14 }, { # else, OS=="win"
15 'variables': { 15 'variables': {
16 'config_h_dir': 16 'config_h_dir':
17 'vsprojects', # crafted for msvc. 17 'vsprojects', # crafted for msvc.
18 }, 18 },
19 'target_defaults': { 19 'target_defaults': {
20 'msvs_disabled_warnings': [ 20 'msvs_disabled_warnings': [
21 4018, # signed/unsigned mismatch in comparison 21 4018, # signed/unsigned mismatch in comparison
22 4244, # implicit conversion, possible loss of data 22 4244, # implicit conversion, possible loss of data
23 4355, # 'this' used in base member initializer list 23 4355, # 'this' used in base member initializer list
24 4267, # size_t to int truncation 24 4267, # size_t to int truncation
25 4291, # no matching operator delete for a placement new
25 ], 26 ],
26 'defines!': [ 27 'defines!': [
27 'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself. 28 'WIN32_LEAN_AND_MEAN', # Protobuf defines this itself.
28 ], 29 ],
29 }, 30 },
30 }], 31 }],
31 ['OS=="ios" and "<(GENERATOR)"!="ninja"', { 32 ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
32 'variables': { 33 'variables': {
33 'ninja_output_dir': 'ninja-protoc', 34 'ninja_output_dir': 'ninja-protoc',
34 'ninja_product_dir': 35 'ninja_product_dir':
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'type': 'static_library', 155 'type': 'static_library',
155 'toolsets': ['host','target'], 156 'toolsets': ['host','target'],
156 'includes': [ 157 'includes': [
157 'protobuf_lite.gypi', 158 'protobuf_lite.gypi',
158 ], 159 ],
159 'sources': [ 160 'sources': [
160 'src/google/protobuf/descriptor.h', 161 'src/google/protobuf/descriptor.h',
161 'src/google/protobuf/descriptor.pb.h', 162 'src/google/protobuf/descriptor.pb.h',
162 'src/google/protobuf/descriptor_database.h', 163 'src/google/protobuf/descriptor_database.h',
163 'src/google/protobuf/dynamic_message.h', 164 'src/google/protobuf/dynamic_message.h',
165 'src/google/protobuf/generated_enum_reflection.h',
164 'src/google/protobuf/generated_message_reflection.h', 166 'src/google/protobuf/generated_message_reflection.h',
165 'src/google/protobuf/message.h', 167 'src/google/protobuf/message.h',
166 'src/google/protobuf/reflection_ops.h', 168 'src/google/protobuf/reflection_ops.h',
167 'src/google/protobuf/service.h', 169 'src/google/protobuf/service.h',
168 'src/google/protobuf/text_format.h', 170 'src/google/protobuf/text_format.h',
169 'src/google/protobuf/wire_format.h', 171 'src/google/protobuf/wire_format.h',
170 'src/google/protobuf/io/gzip_stream.h', 172 'src/google/protobuf/io/gzip_stream.h',
171 'src/google/protobuf/io/printer.h', 173 'src/google/protobuf/io/printer.h',
172 'src/google/protobuf/io/tokenizer.h', 174 'src/google/protobuf/io/tokenizer.h',
173 'src/google/protobuf/io/zero_copy_stream_impl.h', 175 'src/google/protobuf/io/zero_copy_stream_impl.h',
174 'src/google/protobuf/compiler/code_generator.h', 176 'src/google/protobuf/compiler/code_generator.h',
175 'src/google/protobuf/compiler/command_line_interface.h', 177 'src/google/protobuf/compiler/command_line_interface.h',
176 'src/google/protobuf/compiler/importer.h', 178 'src/google/protobuf/compiler/importer.h',
179 'src/google/protobuf/compiler/java/java_doc_comment.cc',
180 'src/google/protobuf/compiler/java/java_doc_comment.h',
177 'src/google/protobuf/compiler/parser.h', 181 'src/google/protobuf/compiler/parser.h',
178 182
179 'src/google/protobuf/stubs/strutil.cc', 183 'src/google/protobuf/stubs/strutil.cc',
180 'src/google/protobuf/stubs/strutil.h', 184 'src/google/protobuf/stubs/strutil.h',
181 'src/google/protobuf/stubs/substitute.cc', 185 'src/google/protobuf/stubs/substitute.cc',
182 'src/google/protobuf/stubs/substitute.h', 186 'src/google/protobuf/stubs/substitute.h',
187 'src/google/protobuf/stubs/stl_util.h',
188 'src/google/protobuf/stubs/stringprintf.cc',
189 'src/google/protobuf/stubs/stringprintf.h',
183 'src/google/protobuf/stubs/structurally_valid.cc', 190 'src/google/protobuf/stubs/structurally_valid.cc',
191 'src/google/protobuf/stubs/template_util.h',
192 'src/google/protobuf/stubs/type_traits.h',
193
184 'src/google/protobuf/descriptor.cc', 194 'src/google/protobuf/descriptor.cc',
185 'src/google/protobuf/descriptor.pb.cc', 195 'src/google/protobuf/descriptor.pb.cc',
186 'src/google/protobuf/descriptor_database.cc', 196 'src/google/protobuf/descriptor_database.cc',
187 'src/google/protobuf/dynamic_message.cc', 197 'src/google/protobuf/dynamic_message.cc',
198 'src/google/protobuf/extension_set.cc',
199 'src/google/protobuf/extension_set.h',
188 'src/google/protobuf/extension_set_heavy.cc', 200 'src/google/protobuf/extension_set_heavy.cc',
189 'src/google/protobuf/generated_message_reflection.cc', 201 'src/google/protobuf/generated_message_reflection.cc',
190 'src/google/protobuf/message.cc', 202 'src/google/protobuf/message.cc',
191 'src/google/protobuf/reflection_ops.cc', 203 'src/google/protobuf/reflection_ops.cc',
192 'src/google/protobuf/service.cc', 204 'src/google/protobuf/service.cc',
193 'src/google/protobuf/text_format.cc', 205 'src/google/protobuf/text_format.cc',
194 'src/google/protobuf/wire_format.cc', 206 'src/google/protobuf/wire_format.cc',
195 # This file pulls in zlib, but it's not actually used by protoc, so 207 # This file pulls in zlib, but it's not actually used by protoc, so
196 # instead of compiling zlib for the host, let's just exclude this. 208 # instead of compiling zlib for the host, let's just exclude this.
197 # 'src/src/google/protobuf/io/gzip_stream.cc', 209 # 'src/src/google/protobuf/io/gzip_stream.cc',
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 'toolsets': ['host', 'target'], 431 'toolsets': ['host', 'target'],
420 }, 432 },
421 { 433 {
422 'target_name': 'py_proto', 434 'target_name': 'py_proto',
423 'type': 'none', 435 'type': 'none',
424 }, 436 },
425 ], 437 ],
426 }], 438 }],
427 ], 439 ],
428 } 440 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698