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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: update defines 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 side-by-side diff with in-line comments
Download patch
« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/protobuf.gyp ('k') | third_party/protobuf/protobuf_nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/protobuf_lite.gypi
diff --git a/third_party/protobuf/protobuf_lite.gypi b/third_party/protobuf/protobuf_lite.gypi
index bbdc072715d40317accb90381f75ece670b2f742..137e807fde6a97ace00d618ef9c64352db1b784f 100644
--- a/third_party/protobuf/protobuf_lite.gypi
+++ b/third_party/protobuf/protobuf_lite.gypi
@@ -4,58 +4,101 @@
{
'sources': [
+ 'src/google/protobuf/arena.cc',
+ 'src/google/protobuf/arena.h',
+ 'src/google/protobuf/arenastring.cc',
+ 'src/google/protobuf/arenastring.h',
+ 'src/google/protobuf/extension_set.cc',
+ 'src/google/protobuf/extension_set.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/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/map.h',
+ 'src/google/protobuf/map_entry_lite.h',
+ 'src/google/protobuf/map_field_lite.h',
+ 'src/google/protobuf/map_type_handler.h',
+ 'src/google/protobuf/message_lite.cc',
+ 'src/google/protobuf/message_lite.h',
+ 'src/google/protobuf/repeated_field.cc',
+ 'src/google/protobuf/repeated_field.h',
'src/google/protobuf/stubs/atomicops.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_power.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/atomic_sequence_num.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/int128.cc',
+ 'src/google/protobuf/stubs/int128.h',
+ 'src/google/protobuf/stubs/logging.h',
+ 'src/google/protobuf/stubs/macros.h',
+ 'src/google/protobuf/stubs/map_util.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/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/stubs/port.h',
+ 'src/google/protobuf/stubs/scoped_ptr.h',
+ 'src/google/protobuf/stubs/shared_ptr.h',
+ 'src/google/protobuf/stubs/status.cc',
+ 'src/google/protobuf/stubs/status.h',
+ 'src/google/protobuf/stubs/status_macros.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/structurally_valid.cc',
+ 'src/google/protobuf/stubs/strutil.cc',
+ 'src/google/protobuf/stubs/strutil.h',
+ 'src/google/protobuf/stubs/template_util.h',
+ 'src/google/protobuf/stubs/type_traits.h',
+ 'src/google/protobuf/stubs/time.cc',
+ 'src/google/protobuf/stubs/time.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<>,
- # which requires RTTI.
'defines': [
+ # This macro must be defined to suppress the use of dynamic_cast<>,
+ # which requires RTTI.
'GOOGLE_PROTOBUF_NO_RTTI',
'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
Peter Kasting 2016/04/13 02:11:45 Nit: I'd put a blank line above this since it's no
+
+ # protobuf requires these to be set manually, as it no longer
Peter Kasting 2016/04/13 02:11:45 This comment doesn't seem to add much, and it's no
xyzzyz 2016/04/14 00:23:57 Done.
+ # uses config.h
+ 'HAVE_PTHREAD',
],
'direct_dependent_settings': {
'include_dirs': [
- '<(config_h_dir)',
'src',
],
'defines': [
« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/protobuf.gyp ('k') | third_party/protobuf/protobuf_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698