summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf
Commit message (Collapse)AuthorAgeFilesLines
* Remove the comments setting emands and vim tab width and expansion variables.tony@chromium.org2011-07-111-6/+0
| | | | | | | | | | | | | | | | | These were added in r28089 (http://codereview.chromium.org/256059) but are unnecessary bloat for everyone to carry around, even those that don't use emacs or vim. In an earlier change, I added editor config files in src/tools/emacs/ and src/tools/vim/ so users of the appropriate editor can source those instead. BUG=none TEST=none Review URL: http://codereview.chromium.org/7310019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92046 0039d316-1c4b-4281-b951-d872f2087c98
* Globally replace <(library) with static_libraryevan@chromium.org2011-05-191-2/+2
| | | | | | | | | | | We provided <(library) as a variable to support a peculiar build configuration on Linux. We no longer support that build configuration, so we can simplify this code to no longer use a variable. Review URL: http://codereview.chromium.org/7051014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86004 0039d316-1c4b-4281-b951-d872f2087c98
* don't link unknown_field_set into both protobuf_lite and protobuf_fullevan@chromium.org2011-05-031-2/+0
| | | | | | | | | This source file was moved from protobuf_full to protobuf_lite in r62331, but accidentally left in both libraries. Review URL: http://codereview.chromium.org/6913006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83823 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update to upstream r371agl@chromium.org2011-04-02120-3462/+13874
| | | | | | | | | | | | | | | | | | | | (This is a reland of r80810.) 1) Got an upstream diff 346:371 from svn 2) Pruned files from the diff that we don't have, as well as descriptor.pb.* 3) Applied and fixed the merge failures. 4) Copied the code (less descriptor.pb.*) back into the svn source. 5) Manually fixed descriptor.pb.* and plugin.pb.* there. 6) Ran ./generate_descriptor_proto.sh and copied the updated files back. 7) Added new source files to the protoc target in protobuf.gyp. BUG=none TEST=sync_unit_tests Review URL: http://codereview.chromium.org/6737030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80265 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "third_party/protobuf: update to upstream r371"agl@chromium.org2011-04-01120-13871/+3462
| | | | | | This reverts commit r80180 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80183 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update to upstream r371agl@chromium.org2011-04-01120-3462/+13871
| | | | | | | | | | | | | | | | | | 1) Got an upstream diff 346:371 from svn 2) Pruned files from the diff that we don't have, as well as descriptor.pb.* 3) Applied and fixed the merge failures. 4) Copied the code (less descriptor.pb.*) back into the svn source. 5) Manually fixed descriptor.pb.* and plugin.pb.* there. 6) Ran ./generate_descriptor_proto.sh and copied the updated files back. 7) Added new source files to the protoc target in protobuf.gyp. BUG=none TEST=sync_unit_tests Review URL: http://codereview.chromium.org/6737030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80180 0039d316-1c4b-4281-b951-d872f2087c98
* Move some files from base to base/memory.levin@chromium.org2011-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raw_scoped_refptr_mismatch_checker.h ref_counted.cc ref_counted.h ref_counted_memory.cc ref_counted_memory.h ref_counted_unittest.cc scoped_callback_factory.h scoped_comptr_win.h scoped_handle.h scoped_native_library.cc scoped_native_library.h scoped_native_library_unittest.cc scoped_nsobject.h scoped_open_process.h scoped_ptr.h scoped_ptr_unittest.cc scoped_temp_dir.cc scoped_temp_dir.h scoped_temp_dir_unittest.cc scoped_vector.h singleton.h singleton_objc.h singleton_unittest.cc linked_ptr.h linked_ptr_unittest.cc weak_ptr.cc weak_ptr.h weak_ptr_unittest.cc BUG=None TEST=Compile Review URL: http://codereview.chromium.org/6714032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update README.chromium.agl@chromium.org2011-03-231-3/+2
| | | | | | | | | | I forgot to update the README.chromium in r62331 to mention that we have local changes to this code now. BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79196 0039d316-1c4b-4281-b951-d872f2087c98
* Cleaning up third_party readmes and adding a template for future use.cdn@chromium.org2011-03-161-1/+3
| | | | | | | | | | | The next step is a presubmit rule that will make people use the template. We are doing this so that we can better track dependancy versions. BUG=None TEST=N/A Review URL: http://codereview.chromium.org/6610030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78316 0039d316-1c4b-4281-b951-d872f2087c98
* Remove obsolete files from 'sources'. This causes needless work on ↵jeanluc@chromium.org2011-01-311-1/+0
| | | | | | | | | | | incremental builds in VS2010. BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6386019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73190 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 73121 - Remove obsolete files from 'sources'. This causes needless ↵nsylvain@chromium.org2011-01-311-0/+1
| | | | | | | | | | | | | | | | | | work on incremental builds in VS2010. This is breaking clobber builds with this error : e:\b\build\slave\google-chrome-rel-win\build\src\chrome_frame\iids.cc(6) : fatal error C1083: Cannot open include file: 'chrome_tab.h': No such file or directory BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6307018 TBR=jeanluc@chromium.org Review URL: http://codereview.chromium.org/6347032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73124 0039d316-1c4b-4281-b951-d872f2087c98
* Remove obsolete files from 'sources'. This causes needless work on ↵jeanluc@chromium.org2011-01-301-1/+0
| | | | | | | | | | | incremental builds in VS2010. BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6307018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73121 0039d316-1c4b-4281-b951-d872f2087c98
* Use protobuf_lite to save on binary size.agl@chromium.org2010-10-131-2/+4
| | | | | | | | | | | | | | | | | Now that we have a forked protobuf-lite library which can retain unknown fields, we can switch to using protobuf-lite. The full protobuf target has been renamed to hopefully avoid accidental use in the future. This saves 357K from a stripped, Release, Linux 'chrome' binary (48032752 -> 47676176). BUG=56579 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/3793001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62426 0039d316-1c4b-4281-b951-d872f2087c98
* protobuf: add unknown field retention to protobuf-lite.agl@chromium.org2010-10-1219-622/+589
| | | | | | | | | BUG=56579 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/3544012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62331 0039d316-1c4b-4281-b951-d872f2087c98
* protobuf: check in local copy.agl@chromium.org2010-09-30238-0/+106019
This change doesn't make us *use* the local copy yet, that's the next step. The checked in code is taken from the same SVN revision which we currently pull with DEPS. (This is a no-op change from the point of view of the build.) BUG=56579 TEST=none http://codereview.chromium.org/3549005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61072 0039d316-1c4b-4281-b951-d872f2087c98