aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-252-6/+15
| | | | Fix issue #77
* Merge pull request #106 from xfxyjwf/fix_62Feng Xiao2014-11-252-14/+14
|\ | | | | Fix javadoc warnings.
| * Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/
* Merge pull request #104 from pherl/masterJisi Liu2014-11-252-0/+27
|\ | | | | Link Java Nano generator into protoc.
| * Merge branch 'master' of github.com:google/protobufJisi Liu2014-11-256-10/+54
| |\ | |/ |/|
* | Fix issue 99.Feng Xiao2014-11-255-7/+48
| |
* | Merge pull request #103 from Ang3lus/masterFeng Xiao2014-11-251-3/+6
|\ \ | | | | | | Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
| * | Fix "anonymous types declared in an anonymous union are an extension"Łukasz Twarduś2014-11-251-3/+6
|/ / | | | | | | warning when using clang with -pedantic switch
| * Link Java Nano generator into protoc.Jisi Liu2014-11-252-0/+27
|/
* Down-integrate from internal code base.Feng Xiao2014-11-2019-201/+624
|
* Add nano proto authors and update LICENSE file to include Android.mk.Feng Xiao2014-11-202-0/+8
|
* Merge pull request #91 from xfxyjwf/android_nanoFeng Xiao2014-11-2057-0/+15021
|\ | | | | Merge nano proto into protobuf repository.
| * Fix the broken link at the bottom of javanano/README.txtFeng Xiao2014-11-201-1/+1
| |
| * Merge nano proto into protobuf repository.Feng Xiao2014-11-1957-0/+15021
| |\ | | | | | | | | | Source: https://android.googlesource.com/platform/external/protobuf.git
| | * Prepare nano proto code to be merged into protobuf repository.Feng Xiao2014-11-1946-394/+249
| | |
| | * Merge "Add platform versions of the protobuf libraries."Dan Albert2014-11-111-0/+37
| | |\
| | | * Add platform versions of the protobuf libraries.Dan Albert2014-11-111-0/+37
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | NDK libraries should not be linked in to platform code, so create a separate version for the platform that is linked against libc++ instead of the NDK STLs. Bug: 15193147 Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855
| | * am dbb9c303: Merge "Added an API method in FieldData to allow access to the ↵Behrooz Khorashadi2014-11-061-0/+17
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | UnknownField data" * commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc': Added an API method in FieldData to allow access to the UnknownField data
| | | * Merge "Added an API method in FieldData to allow access to the UnknownField ↵Behrooz Khorashadi2014-11-061-0/+17
| | | |\ | | | | | | | | | | | | | | | data"
| | | | * Added an API method in FieldData to allow access to the UnknownField dataBehrooz Khorashadi2014-11-051-0/+17
| | | |/ | | | | | | | | | | | | Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
| | * | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-291-10/+13
| | |\| | | | | | | | | | | | | | | | | * commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a': Move protobuf 2.3.0 to prebuilts.
| | | * Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-281-10/+13
| | | |\
| | | | * Move protobuf 2.3.0 to prebuilts.Jeff Davidson2014-10-221-10/+13
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will facilitate an upgrade to 2.6.0 and future versions without breaking applications which have a hardcoded dependency on 2.3.0. The existing make rules have been renamed to omit the version code. The prebuilts were built from a tree at commit 9be7e7401174d75e87e21fdc5f43549594a714bb. Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
| | * | am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-033-12/+31
| | |\| | | | | | | | | | | | | | | | | * commit '9be7e7401174d75e87e21fdc5f43549594a714bb': Change reftypes_primitive_enums to reftypes_compat_mode.
| | | * Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-023-12/+31
| | | |\
| | | | * Change reftypes_primitive_enums to reftypes_compat_mode.Brian Duff2014-10-013-12/+31
| | | |/ | | | | | | | | | | | | | | | | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
| | * | am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| | |\| | | | | | | | | | | | | | | | | * commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d': Adds a primitive enum mode for reftypes.
| | | * Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| | | |\
| | | | * Adds a primitive enum mode for reftypes.Brian Duff2014-09-304-4/+23
| | | |/ | | | | | | | | | | | | | | | | | | | | This is a compatibility shim. Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
| | * | am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in ↵Brian Duff2014-09-171-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | hashCode calculations." * commit 'd3a8acb9a2b3695955c77f364b3a6bd2f1c189bc': Includes a MessageNano subclass's name's hashCode in hashCode calculations.
| | | * Merge "Includes a MessageNano subclass's name's hashCode in hashCode ↵Brian Duff2014-09-171-0/+1
| | | |\ | | | | | | | | | | | | | | | calculations."
| | | | * Includes a MessageNano subclass's name's hashCode in hashCode calculations.Jason Neufeld2014-09-161-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current implementation, a message with the same amount of null or equal-valued fields as a different message type will have the same hashCode. This adds more variety by including the hashCode of the class's name in the hashCode calculations. Change-Id: I284e3e6d198ad8037815948d1f65686465ffd623 Signed-off-by: Jason Neufeld <jneufeld@google.com>
| | * | am c4e7b92f: Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
| | |\| | | | | | | | | | | | | | | | | * commit 'c4e7b92fefce5b069f50659363c8878612303510': Make the tag field public.
| | | * Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
| | | |\
| | | | * Make the tag field public.Brian Duff2014-09-021-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: Ibfda5bb1ac3150ea90d82a152730be76a2f8bf71
| | * | am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
| | |\| | | | | | | | | | | | | | | | | * commit 'ddf016d828d928eefbce89c602c323bf0f998574': Add MessageNano.messageNanoEquals().
| | | * Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
| | | |\
| | | | * Add MessageNano.messageNanoEquals().Brian Duff2014-09-022-0/+29
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows two messages to be compared directly for equality without generating an equals method for every generated message. (Ports CL58125010) Change-Id: I92ab5088539d1fd722fee7b5e28a8c825926c3b6
| | * | am 0068978c: Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| | |\| | | | | | | | | | | | | | | | | * commit '0068978c364173b15a9cb8ab65fb2d2eac17f136': Fixed octal printing of bytearrays
| | | * Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| | | |\
| | | | * Fixed octal printing of bytearraysLinus Tufvesson2014-08-291-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | - Now with 50% less '&' and 100% fewer build breakages! Change-Id: Icf0283220f75cd14b8564b51bd55973e5b7da56b
| | * | am 77866143: Merge "Revert "Fixed octal printing of bytearrays""Max Cai2014-08-291-1/+1
| | |\| | | | | | | | | | | | | | | | | * commit '77866143340f7541180d91fa316071ce947b3a8d': Revert "Fixed octal printing of bytearrays"
| | | * Merge "Revert "Fixed octal printing of bytearrays""Max Cai2014-08-281-1/+1
| | | |\
| | | | * Revert "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8b8481868877c9db407d04bdf4843e50d8920806. Change-Id: I0876235b79cd7745312879d0f1b00c6d1c1a1b7a
| | * | | am 238e0ac5: Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '238e0ac56654afadb5270264660db7305f139c02': Fixed octal printing of bytearrays
| | | * | Merge "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
| | | |\|
| | | | * Fixed octal printing of bytearraysLinus Tufvesson2014-08-281-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: Ia848d7fae9aeab89e65b00f05cee6c1e6d649d94
| | * | am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around ↵Max Cai2014-08-210-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | unknownFieldData." * commit 'c6d612ac7b18ba758c9067136c1217589aa5796f':
| | | * \ am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around ↵Max Cai2014-08-215-13/+33
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unknownFieldData." * commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126': Fix access around unknownFieldData.
| | | | * \ am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-08-215-13/+33
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55ef21bca9802af2a9aadd593cc606706b13f8da': Fix access around unknownFieldData.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-01 20:35:43 +0000