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

Side by Side Diff: third_party/protobuf/protobuf_lite.gypi

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 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
« no previous file with comments | « third_party/protobuf/protobuf.pc.in ('k') | third_party/protobuf/protobuf_nacl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'sources': [ 6 'sources': [
7 'src/google/protobuf/arena.cc',
8 'src/google/protobuf/arena.h',
9 'src/google/protobuf/arenastring.cc',
10 'src/google/protobuf/arenastring.h',
11 'src/google/protobuf/extension_set.cc',
12 'src/google/protobuf/extension_set.h',
13 'src/google/protobuf/generated_message_util.cc',
14 'src/google/protobuf/generated_message_util.h',
15 'src/google/protobuf/io/coded_stream.cc',
16 'src/google/protobuf/io/coded_stream.h',
17 'src/google/protobuf/io/coded_stream_inl.h',
18 'src/google/protobuf/io/zero_copy_stream.cc',
19 'src/google/protobuf/io/zero_copy_stream.h',
20 'src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
21 'src/google/protobuf/io/zero_copy_stream_impl_lite.h',
22 'src/google/protobuf/map.h',
23 'src/google/protobuf/map_entry_lite.h',
24 'src/google/protobuf/map_field_lite.h',
25 'src/google/protobuf/map_type_handler.h',
26 'src/google/protobuf/message_lite.cc',
27 'src/google/protobuf/message_lite.h',
28 'src/google/protobuf/repeated_field.cc',
29 'src/google/protobuf/repeated_field.h',
7 'src/google/protobuf/stubs/atomicops.h', 30 'src/google/protobuf/stubs/atomicops.h',
31 'src/google/protobuf/stubs/atomicops_internals_arm64_gcc.h',
8 'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h', 32 'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',
33 'src/google/protobuf/stubs/atomicops_internals_arm_qnx.h',
9 'src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h', 34 'src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h',
35 'src/google/protobuf/stubs/atomicops_internals_generic_gcc.h',
10 'src/google/protobuf/stubs/atomicops_internals_macosx.h', 36 'src/google/protobuf/stubs/atomicops_internals_macosx.h',
11 'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h', 37 'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h',
38 'src/google/protobuf/stubs/atomicops_internals_pnacl.h',
39 'src/google/protobuf/stubs/atomicops_internals_power.h',
40 'src/google/protobuf/stubs/atomicops_internals_solaris.h',
41 'src/google/protobuf/stubs/atomicops_internals_tsan.h',
12 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc', 42 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
13 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h', 43 'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h',
14 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc', 44 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
15 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h', 45 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',
46 'src/google/protobuf/stubs/atomic_sequence_num.h',
47 'src/google/protobuf/stubs/bytestream.cc',
48 'src/google/protobuf/stubs/bytestream.h',
49 'src/google/protobuf/stubs/callback.h',
50 'src/google/protobuf/stubs/casts.h',
51 'src/google/protobuf/stubs/common.cc',
16 'src/google/protobuf/stubs/common.h', 52 'src/google/protobuf/stubs/common.h',
53 'src/google/protobuf/stubs/fastmem.h',
54 'src/google/protobuf/stubs/hash.h',
55 'src/google/protobuf/stubs/int128.cc',
56 'src/google/protobuf/stubs/int128.h',
57 'src/google/protobuf/stubs/logging.h',
58 'src/google/protobuf/stubs/macros.h',
59 'src/google/protobuf/stubs/map_util.h',
60 'src/google/protobuf/stubs/mutex.h',
61 'src/google/protobuf/stubs/once.cc',
17 'src/google/protobuf/stubs/once.h', 62 'src/google/protobuf/stubs/once.h',
18 'src/google/protobuf/stubs/platform_macros.h', 63 'src/google/protobuf/stubs/platform_macros.h',
19 'src/google/protobuf/extension_set.h', 64 'src/google/protobuf/stubs/port.h',
20 'src/google/protobuf/generated_message_util.h', 65 'src/google/protobuf/stubs/scoped_ptr.h',
21 'src/google/protobuf/message_lite.h', 66 'src/google/protobuf/stubs/shared_ptr.h',
22 'src/google/protobuf/repeated_field.h', 67 'src/google/protobuf/stubs/status.cc',
23 'src/google/protobuf/unknown_field_set.cc', 68 'src/google/protobuf/stubs/status.h',
24 'src/google/protobuf/unknown_field_set.h', 69 'src/google/protobuf/stubs/status_macros.h',
70 'src/google/protobuf/stubs/statusor.cc',
71 'src/google/protobuf/stubs/statusor.h',
72 'src/google/protobuf/stubs/stl_util.h',
73 'src/google/protobuf/stubs/stringpiece.cc',
74 'src/google/protobuf/stubs/stringpiece.h',
75 'src/google/protobuf/stubs/stringprintf.cc',
76 'src/google/protobuf/stubs/stringprintf.h',
77 'src/google/protobuf/stubs/structurally_valid.cc',
78 'src/google/protobuf/stubs/strutil.cc',
79 'src/google/protobuf/stubs/strutil.h',
80 'src/google/protobuf/stubs/template_util.h',
81 'src/google/protobuf/stubs/type_traits.h',
82 'src/google/protobuf/stubs/time.cc',
83 'src/google/protobuf/stubs/time.h',
84 'src/google/protobuf/wire_format_lite.cc',
25 'src/google/protobuf/wire_format_lite.h', 85 'src/google/protobuf/wire_format_lite.h',
26 'src/google/protobuf/wire_format_lite_inl.h', 86 'src/google/protobuf/wire_format_lite_inl.h',
27 'src/google/protobuf/io/coded_stream.h',
28 'src/google/protobuf/io/zero_copy_stream.h',
29 'src/google/protobuf/io/zero_copy_stream_impl_lite.h',
30
31 'src/google/protobuf/stubs/common.cc',
32 'src/google/protobuf/stubs/once.cc',
33 'src/google/protobuf/stubs/hash.h',
34 'src/google/protobuf/stubs/map-util.h',
35 'src/google/protobuf/extension_set.cc',
36 'src/google/protobuf/generated_message_util.cc',
37 'src/google/protobuf/message_lite.cc',
38 'src/google/protobuf/repeated_field.cc',
39 'src/google/protobuf/wire_format_lite.cc',
40 'src/google/protobuf/io/coded_stream.cc',
41 'src/google/protobuf/io/coded_stream_inl.h',
42 'src/google/protobuf/io/zero_copy_stream.cc',
43 'src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
44 '<(config_h_dir)/config.h',
45 ], 87 ],
46 'include_dirs': [ 88 'include_dirs': [
47 '<(config_h_dir)',
48 'src', 89 'src',
49 ], 90 ],
50 # This macro must be defined to suppress the use of dynamic_cast<>,
51 # which requires RTTI.
52 'defines': [ 91 'defines': [
92 # This macro must be defined to suppress the use of dynamic_cast<>,
93 # which requires RTTI.
53 'GOOGLE_PROTOBUF_NO_RTTI', 94 'GOOGLE_PROTOBUF_NO_RTTI',
95
54 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER', 96 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
97 'HAVE_PTHREAD',
55 ], 98 ],
56 'direct_dependent_settings': { 99 'direct_dependent_settings': {
57 'include_dirs': [ 100 'include_dirs': [
58 '<(config_h_dir)',
59 'src', 101 'src',
60 ], 102 ],
61 'defines': [ 103 'defines': [
62 'GOOGLE_PROTOBUF_NO_RTTI', 104 'GOOGLE_PROTOBUF_NO_RTTI',
63 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER', 105 'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
64 ], 106 ],
65 # TODO(jschuh): http://crbug.com/167187 size_t -> int. 107 # TODO(jschuh): http://crbug.com/167187 size_t -> int.
66 'msvs_disabled_warnings': [ 4267 ], 108 'msvs_disabled_warnings': [ 4267 ],
67 }, 109 },
68 } 110 }
OLDNEW
« no previous file with comments | « third_party/protobuf/protobuf.pc.in ('k') | third_party/protobuf/protobuf_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698