| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(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
|
|
|
|
|
|
| |
This reverts commit r80180
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80183 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
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
|