summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf
Commit message (Collapse)AuthorAgeFilesLines
* Linux: fix header includes for system protobuf.phajdan.jr@chromium.org2012-11-211-0/+2
| | | | | | | | | BUG=157155 Review URL: https://chromiumcodereview.appspot.com/11418102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168945 0039d316-1c4b-4281-b951-d872f2087c98
* Fix protobuf_lite_java action ordering in gyp.nyquist@chromium.org2012-11-201-0/+3
| | | | | | | | | | | | The ordering of actions within protobuf_lite_java was non-deterministic. With this CL action B depends on action A, and as such the order is deterministic. BUG=161967 Review URL: https://codereview.chromium.org/11308125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168835 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for generating jars from protos and add cacheinvalidation_java.nyquist@chromium.org2012-11-142-2/+2
| | | | | | | | | | | | | The cacheinvalidation_java target is also added to build/all_android.gyp to ensure it is always built since nothing currently depends on it upstream. When all of Android-specific sync code is upstreamed, a target for sync should be used instead of cacheinvalidation. BUG=158382 Review URL: https://chromiumcodereview.appspot.com/11146005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167746 0039d316-1c4b-4281-b951-d872f2087c98
* Update protobuf by cherry-picking upstream r430:mark@chromium.org2012-11-143-9/+10
| | | | | | | | | | | | | | | | | | Update protobuf for 64-bit compatibility on Mac OS X. The system's routines from <libkern/OSAtomic.h> use int64_t as their 64-bit type. int64_t is a typedef for long long. Google's atomicops.h routines use Atomic64 as their 64-bit type. Atomic64 is a typedef for intptr_t, which is in turn a typedef for long. It isn't possible to cast from long* to long long* with const_cast, reinterpret_cast is needed. This change fixes this problem the same way Chrome fixed it in https://codereview.chromium.org/6091007 . protobuf r423 renamed GOOGLE_PROTOBUF_HOST_ARCH_64_BIT to GOOGLE_PROTOBUF_ARCH_64_BIT, but the change was not made in atomicops_internals_atomicword_compat.h. Review URL: https://codereview.chromium.org/11293276 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167682 0039d316-1c4b-4281-b951-d872f2087c98
* Check in protobuf java code and generate lite jar.nyquist@chromium.org2012-11-1473-0/+27452
| | | | | | | | | | | Since we only need the lite version of protobuf, we generate a jar file based on includes in the maven pom.xml file for the lite profile. BUG=158382 Review URL: https://chromiumcodereview.appspot.com/11347026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167557 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Linux: change protobuf default option to allow building"nyquist@chromium.org2012-11-124-67/+65
| | | | | | | | | | | | | | | | | This reverts commit baefae90f294a981c973bffbdd3eccabfe796b6a. The change broke Chrome for Android because non-vanilla protobuf-lite Java files were generated. Original review: https://codereview.chromium.org/11228038/ TBR=phajdan.jr BUG=160256 Review URL: https://codereview.chromium.org/11359146 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167242 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: use full protobuf when using system protobuf.phajdan.jr@chromium.org2012-11-091-3/+7
| | | | | | | | | | | | | System protobuf does not have our custom patch to retain unknown fields in lite mode, so we need the full one. BUG=157155 Review URL: https://chromiumcodereview.appspot.com/11359111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166925 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: change protobuf default option to allow buildingphajdan.jr@chromium.org2012-11-074-65/+67
| | | | | | | | | | | | | | | | | | with unpatched system protobuf. This is a preparation for landing https://codereview.chromium.org/11231046/ and a solution chosen because our custom protobuf changes will not be accepted upstream. Setting defaults to optimize for lite runtime and retain unknown fields makes it possible to use the same .proto files with system protobuf. BUG=157155 TEST=none Review URL: https://codereview.chromium.org/11228038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166534 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: add an option to build with system protobuf.phajdan.jr@chromium.org2012-10-311-350/+390
| | | | | | | | | | | | | | | | This doesn't work yet without upstream protobuf changes, but with this infrastructure in place it's going to be easier to test further updates. Google Chrome will of course use the bundled version, there's no change here. BUG=157155 TEST=none Review URL: https://codereview.chromium.org/11231046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165257 0039d316-1c4b-4281-b951-d872f2087c98
* Specify dependences correctly when building mac tools for iOS.blundell@chromium.org2012-10-291-19/+44
| | | | | | | | | | | | | | | | | | | Several auxiliary tools used when building Chrome for iOS are generated via the following two-step pattern: (1) compiling the executable with ninja, and (2) copying the executable into a location that is shared with other projects. Previously, these two steps were specified as actions in the same target. However, as the ordering of multiple actions in one target is defined only by inputs and outputs and the compilation action had no inputs/outputs set, the copying action wasn't properly depending on the compilation action. As it's challenging to set correct inputs for the ninja build, this CL separates these actions into two targets in order to be able to specify that the second action should not run until the first action finishes. Review URL: https://chromiumcodereview.appspot.com/11301003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164743 0039d316-1c4b-4281-b951-d872f2087c98
* Fix compilation on vs2012 for protocscottmg@chromium.org2012-10-102-1/+3
| | | | | | | | | | R=cpu@chromium.org BUG=143646 Review URL: https://chromiumcodereview.appspot.com/11098050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161182 0039d316-1c4b-4281-b951-d872f2087c98
* Protobuf: Cherry-pick upstream r427.hans@chromium.org2012-10-013-2/+4
| | | | | | | | | | | Use string::size_type instead of int for results of string::find_first_of(). BUG=151927 Review URL: https://codereview.chromium.org/11012009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159466 0039d316-1c4b-4281-b951-d872f2087c98
* Update protobuf.gyp for iOS.qsr@chromium.org2012-08-091-66/+106
| | | | | | | | | | | | | protoc must be build for the Mac platform and not for iOS. mac_build.gypi is used to allow this. TEST=None BUG=None R=stuartmorgan@chromium.org Review URL: https://chromiumcodereview.appspot.com/10855048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150778 0039d316-1c4b-4281-b951-d872f2087c98
* Make 'License' field in third-party metadata requiredsteveblock@chromium.org2012-08-011-0/+1
| | | | | | | | | | | | | | | | This will simplify the addition of a tool to check licenses for the purpose of the Android WebView build. See also http://codereview.chromium.org/10827099 Also adds other missing fields to these README.chromium files as required by presubmit checks and fixes a regex used to enforce this. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10821103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149423 0039d316-1c4b-4281-b951-d872f2087c98
* Roll Protobuf r415:r423. ↵pliard@chromium.org2012-07-2616-247/+273
| | | | | | | | | | | | | | | | | | | | | 1) Got an upstream diff 415:423 from svn 2) Applied 3) Updated protobuf.gyp Changelog: r423 Add support for NaCl in atomicops. r422 Fix issue/333. skip any escaped characters in quotes. r421 -lz in protobuf.pc belongs in Libs.private, not Libs r420 set _VARDADIC_MAX=10 preprocessor definition to make test pass in vc11. r419 Allow configure to disable maintainer mode r418 Update atomicops to support new platforms where intptr_t = long. r417 Fix a NULL/bool conversion. r416 Fix issue 378 Review URL: https://chromiumcodereview.appspot.com/10793026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148557 0039d316-1c4b-4281-b951-d872f2087c98
* protobuf: Fix a null/bool conversion.thakis@chromium.org2012-05-171-1/+1
| | | | | | | | | | BUG=none TEST=none TBR=agl Review URL: https://chromiumcodereview.appspot.com/10386158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137666 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update to upstream r415.pliard@chromium.org2012-05-1111-126/+347
| | | | | | | | | | | | | 1) Got an upstream diff 412:415 from svn 2) Applied and fixed conflicts in cpp_message.cc 3) Added -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER in protobuf.gyp Note that this removes 52 static initializers previously generated by protoc. Review URL: https://chromiumcodereview.appspot.com/10382099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136585 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update to upstream r412.pliard@chromium.org2012-03-154-32/+12
| | | | | | | | | | | | | | | | | | 1) Got an upstream diff 411:412 from svn 2) Applied 3) Modified protobuf.gyp to make it platform independent thanks to the new guards added in atomicops_internals_x86_gcc.cc and atomicops_internals_x86_msvc.cc. Note that the previous change adding atomicops added a significant complexity to protobuf.gyp to handle platform-specific source files. Because it was using target_arch only, it did not even work properly. Indeed protobuf_lite needs to deal with the host architecture when it is built to be used by protoc. Review URL: http://codereview.chromium.org/9706016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126922 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update to upstream r411.pliard@chromium.org2012-03-0632-104/+1888
| | | | | | | | | | | | | | | | | 1) Got an upstream diff 371:411 from svn 2) Pruned files from the diff that we don't have (e.g. java/). 3) Applied and fixed the merge failures. 4) Added new source files to the protobuf_lite target in protobuf.gyp. This update is needed to pull the newly added atomicops which will help me get rid of static initializers. BUG=none TEST=sync_unit_tests Review URL: http://codereview.chromium.org/9602008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125145 0039d316-1c4b-4281-b951-d872f2087c98
* Upstream: Third-party change to build net_unittests for Android.jingzhao@chromium.org2011-11-231-0/+12
| | | | | | | | | | BUG= TEST= Review URL: http://codereview.chromium.org/8547010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111305 0039d316-1c4b-4281-b951-d872f2087c98
* 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
generated by cgit v1.1 at 2024-09-09 16:20:08 +0000