Feng Xiao
cd980d1c13
Prepare nano proto code to be merged into protobuf repository.
10 years ago
Dan Albert
6dc3924536
Merge "Add platform versions of the protobuf libraries."
10 years ago
Dan Albert
68e7e78257
Add platform versions of the protobuf libraries.
...
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
10 years ago
Behrooz Khorashadi
e214da2663
am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data"
...
* commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc':
Added an API method in FieldData to allow access to the UnknownField data
10 years ago
Behrooz Khorashadi
0b6a8f70fd
Merge "Added an API method in FieldData to allow access to the UnknownField data"
10 years ago
Behrooz Khorashadi
5d6fc1921d
Added an API method in FieldData to allow access to the UnknownField data
...
Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
10 years ago
Jeff Davidson
e4e7f3a25d
am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."
...
* commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a':
Move protobuf 2.3.0 to prebuilts.
10 years ago
Jeff Davidson
59f2ff5856
Merge "Move protobuf 2.3.0 to prebuilts."
10 years ago
Jeff Davidson
dac016786a
Move protobuf 2.3.0 to prebuilts.
...
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
10 years ago
Brian Duff
4d6e9c5f6d
am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
...
* commit '9be7e7401174d75e87e21fdc5f43549594a714bb':
Change reftypes_primitive_enums to reftypes_compat_mode.
10 years ago
Brian Duff
188a2d6f5e
Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
10 years ago
Brian Duff
7fbf654004
Change reftypes_primitive_enums to reftypes_compat_mode.
...
Make the clear() method stripped in reftypes_compat_mode.
Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
10 years ago
Brian Duff
50a024fbe1
am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."
...
* commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d':
Adds a primitive enum mode for reftypes.
10 years ago
Brian Duff
517591b8ea
Merge "Adds a primitive enum mode for reftypes."
10 years ago
Brian Duff
a892068c2d
Adds a primitive enum mode for reftypes.
...
This is a compatibility shim.
Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
10 years ago
Brian Duff
7d8185c963
am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."
...
* commit 'd3a8acb9a2b3695955c77f364b3a6bd2f1c189bc':
Includes a MessageNano subclass's name's hashCode in hashCode calculations.
10 years ago
Brian Duff
14e2f6cb37
Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations."
10 years ago
Jason Neufeld
87bd4029cf
Includes a MessageNano subclass's name's hashCode in hashCode calculations.
...
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>
10 years ago
Brian Duff
6c82acd0c8
am c4e7b92f: Merge "Make the tag field public."
...
* commit 'c4e7b92fefce5b069f50659363c8878612303510':
Make the tag field public.
10 years ago
Brian Duff
e1458bba77
Merge "Make the tag field public."
10 years ago
Brian Duff
5a9b4501db
Make the tag field public.
...
Change-Id: Ibfda5bb1ac3150ea90d82a152730be76a2f8bf71
10 years ago
Brian Duff
5db346f1ef
am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."
...
* commit 'ddf016d828d928eefbce89c602c323bf0f998574':
Add MessageNano.messageNanoEquals().
10 years ago
Brian Duff
553d39f9d8
Merge "Add MessageNano.messageNanoEquals()."
10 years ago
Brian Duff
72881dad55
Add MessageNano.messageNanoEquals().
...
Allows two messages to be compared directly for equality without
generating an equals method for every generated message.
(Ports CL58125010)
Change-Id: I92ab5088539d1fd722fee7b5e28a8c825926c3b6
10 years ago
Max Cai
80241687af
am 0068978c: Merge "Fixed octal printing of bytearrays"
...
* commit '0068978c364173b15a9cb8ab65fb2d2eac17f136':
Fixed octal printing of bytearrays
10 years ago
Max Cai
9d9cb7c330
Merge "Fixed octal printing of bytearrays"
10 years ago
Max Cai
be60c85171
am 77866143: Merge "Revert "Fixed octal printing of bytearrays""
...
* commit '77866143340f7541180d91fa316071ce947b3a8d':
Revert "Fixed octal printing of bytearrays"
10 years ago
Max Cai
a609653bd3
am 238e0ac5: Merge "Fixed octal printing of bytearrays"
...
* commit '238e0ac56654afadb5270264660db7305f139c02':
Fixed octal printing of bytearrays
10 years ago
Linus Tufvesson
2d60e102fa
Fixed octal printing of bytearrays
...
- Now with 50% less '&' and 100% fewer build breakages!
Change-Id: Icf0283220f75cd14b8564b51bd55973e5b7da56b
10 years ago
Max Cai
2b69e07cf3
Merge "Revert "Fixed octal printing of bytearrays""
10 years ago
Max Cai
42da25e969
Revert "Fixed octal printing of bytearrays"
...
This reverts commit 8b8481868877c9db407d04bdf4843e50d8920806.
Change-Id: I0876235b79cd7745312879d0f1b00c6d1c1a1b7a
10 years ago
Max Cai
04f70ef5c7
Merge "Fixed octal printing of bytearrays"
10 years ago
Linus Tufvesson
32a45d0921
Fixed octal printing of bytearrays
...
Change-Id: Ia848d7fae9aeab89e65b00f05cee6c1e6d649d94
10 years ago
Max Cai
274705a916
am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
...
* commit 'c6d612ac7b18ba758c9067136c1217589aa5796f':
10 years ago
Max Cai
1dad0f2307
am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
...
* commit 'b172d66772c921589a1338f00b34ff5bc3bcc225':
10 years ago
Ying Wang
08dd6049ee
am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
...
* commit 'e9d25570a8f67156a77260176b4a7a6f008e156c':
10 years ago
Baligh Uddin
c64af59b6f
am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
...
* commit 'b088989c421c7d7379632ffb4f1fdc221ed9d2c9':
10 years ago
Wink Saville
944f597185
am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
...
* commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':
10 years ago
Wink Saville
df60b2505d
am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
...
* commit '8add9962a5c88ff307d573be91bb091a2b14568d':
10 years ago
Jan-Willem Maarse
c430d41033
am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
...
* commit '1944e19cb1dc82a52d46a42fe8a0ed4037602565':
10 years ago
Bill Yi
c1a565c4d0
am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
...
* commit '7f3f30e96965e7189430e4acc53520275627264c':
10 years ago
Jeff Davidson
d777adae82
am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
...
* commit '7bf587289933768ada48e79cf43deecfad65c576':
10 years ago
Max Cai
6745fbb9ea
am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
...
* commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':
10 years ago
Max Cai
2e738aa77c
am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':
10 years ago
Wink Saville
fce0ffdf13
am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
...
* commit 'dc94687566ba7d98f65e4769d9c0e7d2f20ce895':
10 years ago
Wink Saville
9378b718d1
am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
...
* commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':
10 years ago
Max Cai
dd49d0a1e9
am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
...
* commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126':
Fix access around unknownFieldData.
10 years ago
Max Cai
e57ee765da
am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
...
* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
Keep pointers to extension values.
10 years ago
Ying Wang
11985d9b4e
am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
...
* commit 'cca3823db855ecbcad350332a274f253be7e9662':
10 years ago
Baligh Uddin
3d5bce541d
am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
...
* commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
10 years ago