c6d612ac7b18ba758c9067136c1217589aa5796f |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." * commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126': Fix access around unknownFieldData.
|
b172d66772c921589a1338f00b34ff5bc3bcc225 |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." * commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a': Keep pointers to extension values.
|
e9d25570a8f67156a77260176b4a7a6f008e156c |
21-Aug-2014 |
Ying Wang <wangying@google.com> |
am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT * commit 'cca3823db855ecbcad350332a274f253be7e9662':
|
b088989c421c7d7379632ffb4f1fdc221ed9d2c9 |
21-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
|
b38ef83f969221c2cbb891e609bb80f7a53a034d |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '1f8913765270e9d90ad7384156629e116236355d':
|
8add9962a5c88ff307d573be91bb091a2b14568d |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" * commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
|
1944e19cb1dc82a52d46a42fe8a0ed4037602565 |
21-Aug-2014 |
Jan-Willem Maarse <maarse@google.com> |
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 'a3ab4364c6bb266e8b5021913b22433d8401ec46':
|
7f3f30e96965e7189430e4acc53520275627264c |
21-Aug-2014 |
Bill Yi <byi@google.com> |
am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
|
7bf587289933768ada48e79cf43deecfad65c576 |
21-Aug-2014 |
Jeff Davidson <jpd@google.com> |
am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master * commit '3656cc20c8a569964d0450ce3207b651c007c35c':
|
ee16014efd4d8a9aff0fd6efc40782ce250a1cd8 |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':
|
2b4699938126550d4e6ba7a3e0f70672c2625c20 |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '61317c325de4a7736ea88e72ff4be4193583e1c3':
|
dc94687566ba7d98f65e4769d9c0e7d2f20ce895 |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':
|
9160bc69c92253ddcdbe30a6737adc2bcc515c66 |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict * commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
|
ecb2c88b22ad898c088a81870f58adbf4e16d126 |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." * commit '55ef21bca9802af2a9aadd593cc606706b13f8da': Fix access around unknownFieldData.
|
2e6d4ae02a955d33a75c0642b8ffead20e11fd9a |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am f39998c2: am daf63839: Merge "Keep pointers to extension values." * commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9': Keep pointers to extension values.
|
cca3823db855ecbcad350332a274f253be7e9662 |
21-Aug-2014 |
Ying Wang <wangying@google.com> |
am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT * commit '4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7':
|
57e2ee788511ddc26e694cc783d3e95b52f0e0d4 |
21-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit 'f8b1f8314e84b8a174289c0ce492d154016fe7bd':
|
1f8913765270e9d90ad7384156629e116236355d |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':
|
f13aadfb6dfc707520809dbf4502e3001fd1424b |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" * commit 'd1439291d0a2d6558903205676d41410c319587e': Revert "Merge commit 'e887563a' into fix-merge-conclict"
|
a3ab4364c6bb266e8b5021913b22433d8401ec46 |
21-Aug-2014 |
Jan-Willem Maarse <maarse@google.com> |
am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':
|
d0f3ba6003b1c9430349043d7f979d600967dd2f |
21-Aug-2014 |
Bill Yi <byi@google.com> |
am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '0e54db6b8ac292b4193a924176a939d4326e803b':
|
3656cc20c8a569964d0450ce3207b651c007c35c |
21-Aug-2014 |
Jeff Davidson <jpd@google.com> |
am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master * commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
|
f613f9e7af780863acc441bd70b10e19bb61cc6e |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit '3af26f43dc55563842cee8604f1e802bf40a2585':
|
61317c325de4a7736ea88e72ff4be4193583e1c3 |
21-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
|
6eb7a51929ccbbd916a0da39514a4c5877b696d5 |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':
|
390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e |
21-Aug-2014 |
Wink Saville <wink@google.com> |
am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict * commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
|
89f0407f57f9127ab8d1040a06af741173faece2 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '232698c44c5d0fec83030adcc4c2048964f2dc66':
|
b28d17386a434ee49e48d958823141036ed8c127 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':
|
339f5a6db8053b4095af6454250e246ffeb8b295 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." * commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':
|
34559f88be5c2071a9be321ed01725b364cdf29d |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':
|
6f45464eb45eba2846ee9e96aaecd81fef4662ef |
20-Aug-2014 |
Jie Dai <jied@google.com> |
am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
|
cb395443fb9a2066dba2a5c0f71aaf088fd0ad1c |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit '5843426abfdb490874f9d523dac04a825580c7af':
|
c1d044c0b1b97265e3bef096acdaa503d9ec615a |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit 'd043ff9d86baa219256036053f09dc5190f38f63':
|
ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':
|
a155ce7ea537b9388e0785d74363f3e11177a5e0 |
20-Aug-2014 |
Andrew Flynn <flynn@google.com> |
am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '3628a851ca99c7b2058702aad9bb97f408513e56':
|
dad271e9a19fe98c4dd987ee5398b316309ace3e |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit 'a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b':
|
3a324516bd8757996725ac3c28224bc41d5123be |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '01d1cdebf2de82c31ccd98909530213c489809a7':
|
8d5b7fb23a951dabb95bce445ef588b68e6b0e63 |
20-Aug-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '23b66756ffe59505358b83f93ebe5880eb1be702':
|
6d879b4e0d411dd925978437c43e052cf3fba00e |
20-Aug-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'e747813b29262b01b7f5417286d18d5b0040a1cc':
|
a59cc53b9271c09380769f86846583a94349f390 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'c0bffb629f7dc431c6d458956e615d13231edcfa':
|
9b07838482cc1c03bf486ea9b5f465d329bb07df |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '6ca2db13d632e79b7ddde073f5693cf648ee8ee0':
|
2267616c6621b748c8551c9895e47a792ee04cb2 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '8948d605872d310771d1e9e73669778660a6b787':
|
4b700b8a8b6ed8151aa22b99b2e0dac214e251f3 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit 'dce52afd8eb043950cbfac7e057362918159b07f':
|
438ca4a840876afd43ac8cbea4df2130c0629072 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit 'f1c5cd09595cd305a25713cc85e1f79a0711bf40':
|
17395e556af77b06ea3de454d5c279802ec8cc49 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit 'e668f0c3a996574010b60daa74823bfa9429dcda':
|
826b4cf541f3d21f374e2749c48348c6539c6b2e |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '74b536a558743acacb10e00aced05e59249a76bc':
|
3c4cfdab8ef45fd94de3acb4f95dd35defa58a41 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit '80fe180823978fc40c77e035dbbaea8d1a641ea1':
|
03016e747254a97144db2703106787b493fb5014 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit '2cb17b1847eb7d6d0d1180bc0f16fca0255987d2':
|
fa0eb541ce7abf79b1bf7ba5526d3418d74657ab |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit 'bd188bc73c8d0f6214192b66780764cf4315530e':
|
eaac3e7b84356fe00296604faf75cbcaba57e6a0 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit '4734b9898c715a060e3d4f56ddf79be9fc6f2d1e':
|
a61b2ef1d7b372b858b6aae07cf3eebbf62184b8 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit 'e90564050f017e6e5d78ed5328c21a2b445e1122':
|
056670c92d2a1420accbb07e636b895d925df2a1 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit 'e655a86220da5f0e3a5135a0cf82ac4e114a2466':
|
73789372578a45ceae125e2f66254988ac7eed73 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit '8d2f4cf7214e1c6c2df85212cfbbd8859e04203a':
|
8973d9e63f9f972d646b07719d9292752e3aa382 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit 'c6ec950e9cc24aed39c2e6ba70b2760407b9d186':
|
d8fbc18826e4945c45b22b5d36d5e07deb08bf0a |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit 'b42d51071f44afef6c4ca5afe1c76501a5b057c7':
|
8877603f0c61a959ef667df563429589f3a71cc0 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit '2b2d73d26843cf178a1f23f30472934060194519':
|
dde8a694bae836c024acd5dbed7690a3d2f5ee38 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit 'a19dbf97df8416851dda1e01c5b27642d04e257a':
|
54ad71fb613edb446a3f28de79e1e0d11b345fc5 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit 'e6780389313c3269c725a4f245bba4513ec6879c':
|
242aa182dd320e27e551e1a0f5a1aeafb3f73fb5 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit '5a9d43b211ede37422ca16feb06fa6f04a450f18':
|
cd22086de194f7d8b94b47627c4c4f3fecfee95c |
20-Aug-2014 |
Adam Metcalf <gamblore@google.com> |
am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. * commit 'c0bc136bb738812862d45b53f8546200741d558b':
|
aa2e7e5fb6358b70d17b5dfe145cef61db1888ce |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit '3a2460f3dda97d12e4f592d727549fe7b1214b40':
|
ed67cd79c6deb58ba287a45753b076bed3a817c5 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'd801ea90d87ceb1aa4d2cf591885c3d2c885d1d8':
|
1c524da854c2351a5fc92f77fa4f63980ba5b4c7 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172':
|
3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79':
|
a94fe6cb54165b8139b719f287cdad4973f93643 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '7a8797abb1f80e93522b0a7c7acd177afb3ba0a4':
|
b09fd32de981b889f973de772a696cef47162ebf |
20-Aug-2014 |
Ying Wang <wangying@google.com> |
am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':
|
232698c44c5d0fec83030adcc4c2048964f2dc66 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'de6420aa3fef9f6f85e88fd8e0c7667230d81753':
|
0cb1a2f69a2a2099b3af052eaa2e573e59263b63 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit 'c8f69926325e0653ba4244dbd041c2d29b784194':
|
67584f49159c3f677abb15c2c58a9c75bca5da2f |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." * commit '9de5297388d67b5ddefdb3cf4e1f13a50f0a9c10':
|
1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '0eaea6a8d71e3b323f2fe3bccb3829162c04e33c':
|
1af058a52b92a90c7d215f8627a7366cfe1185cf |
20-Aug-2014 |
Jie Dai <jied@google.com> |
am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit '0ce2c26133762a55c52c0262bbe393370b806276':
|
5843426abfdb490874f9d523dac04a825580c7af |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit '0c063c66604c5dee434534ff775eb6d18ce4ed7b':
|
d043ff9d86baa219256036053f09dc5190f38f63 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '06396abfe648b84e4c17d0e4a98a6cd34d57aaab':
|
b22123d1d9331a35fa6a5b081acf04db090cc9b4 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'e41d4c041cb2c6d58c4508cf792cd4e987991b2a':
|
3628a851ca99c7b2058702aad9bb97f408513e56 |
20-Aug-2014 |
Andrew Flynn <flynn@google.com> |
am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '11b030c32e2b740283ddd455e1e29748667cf314':
|
a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '843619f3a85440e94d1cbec0f71173eb560d6d73':
|
01d1cdebf2de82c31ccd98909530213c489809a7 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '175d44dbf967c326956f5ee11cfe72cbd571601c':
|
23b66756ffe59505358b83f93ebe5880eb1be702 |
20-Aug-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit 'bfa5ee2ff6bde25e15bcf855f60208c01bf7fd5e':
|
e747813b29262b01b7f5417286d18d5b0040a1cc |
20-Aug-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit '6a76a968d2c5c22a313dd2646d1b2941d17ff89d':
|
c0bffb629f7dc431c6d458956e615d13231edcfa |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e':
|
6ca2db13d632e79b7ddde073f5693cf648ee8ee0 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '7630b4785d2675d37a272dc274318bd5a77c3805':
|
8948d605872d310771d1e9e73669778660a6b787 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '4d28b813b64ccc215cd462de7f33455abbe04d0b':
|
dce52afd8eb043950cbfac7e057362918159b07f |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit 'fdf5bde4157bb3e5a5dc36d4acda930fd74933f1':
|
f1c5cd09595cd305a25713cc85e1f79a0711bf40 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit 'be303d0372ccf9e2fbc0abf238b925142ba0a8bf':
|
e668f0c3a996574010b60daa74823bfa9429dcda |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit '2693b3aadbddaa28c4f9b4f3f11236b986f15557':
|
74b536a558743acacb10e00aced05e59249a76bc |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit 'a84e8aa6cd9b98e52d70d93ab10cbdf9c48c5a26':
|
80fe180823978fc40c77e035dbbaea8d1a641ea1 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit 'c45fb6a2338edd7c900fcd3612da79ec9d0a43e5':
|
2cb17b1847eb7d6d0d1180bc0f16fca0255987d2 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit 'b2a7fc6b0585f3c53ea8110a8740141847f3394e':
|
bd188bc73c8d0f6214192b66780764cf4315530e |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit 'ab8cc07120d0fbb6ea4982459bc4238f0eea61bd':
|
4734b9898c715a060e3d4f56ddf79be9fc6f2d1e |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit 'aa2afb0865fa9c15dcaf657d13c5144186548320':
|
e90564050f017e6e5d78ed5328c21a2b445e1122 |
20-Aug-2014 |
Max Cai <maxtroy@google.com> |
am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit '6ed6b682a2b93135e3f5cffc7e7627b879354c82':
|
e655a86220da5f0e3a5135a0cf82ac4e114a2466 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit 'f7bbfdfd53b1fbe0073eaa2b132d358edae2b545':
|
8d2f4cf7214e1c6c2df85212cfbbd8859e04203a |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit 'ea95349d36ad1894fd68b23b04bc9a6422adeeb0':
|
c6ec950e9cc24aed39c2e6ba70b2760407b9d186 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit 'b624b3aa455ecf71c44bde4cf7488e7c199a0b8a':
|
b42d51071f44afef6c4ca5afe1c76501a5b057c7 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit 'a6ddccbbac403dbe6fce5623768755c08d41c962':
|
2b2d73d26843cf178a1f23f30472934060194519 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit 'a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c':
|
a19dbf97df8416851dda1e01c5b27642d04e257a |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit '6d1e97097eca8f50e629c10fcabbffbe064868b8':
|
e6780389313c3269c725a4f245bba4513ec6879c |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit '998ea484ba19563fd32ba3e2e16e785f449afa74':
|
5a9d43b211ede37422ca16feb06fa6f04a450f18 |
20-Aug-2014 |
Ulas Kirazci <ulas@google.com> |
am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':
|
c0bc136bb738812862d45b53f8546200741d558b |
20-Aug-2014 |
Adam Metcalf <gamblore@google.com> |
am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. * commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':
|
3a2460f3dda97d12e4f592d727549fe7b1214b40 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':
|
d801ea90d87ceb1aa4d2cf591885c3d2c885d1d8 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '2fb1789c06fa82f73d136d83189ad1a54043348d':
|
9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '50ddd7addefb02ca23efd2f2c60442f91e276792':
|
02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':
|
7a8797abb1f80e93522b0a7c7acd177afb3ba0a4 |
20-Aug-2014 |
Wink Saville <wink@google.com> |
am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':
|
f25e1e6bb77d583855d68c72a3bfd237a12178ab |
20-Aug-2014 |
Ying Wang <wangying@google.com> |
am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit '165d4d7e343099e4b84137b852a0a2070c27bba4':
|
f91b7fa173d2aa76ce593c20e429bd8d480599ea |
05-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
Fix build, by using external/zlib instead of system zlib Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51
ndroid.mk
|
55ef21bca9802af2a9aadd593cc606706b13f8da |
15-Jul-2014 |
Max Cai <maxtroy@google.com> |
am a88808d4: Merge "Fix access around unknownFieldData." * commit 'a88808d414308b5b567d3afaab56fc338ad80667': Fix access around unknownFieldData.
|
f39998c2c5754ec6e2ff5ddfa529a079093b41e9 |
15-Jul-2014 |
Max Cai <maxtroy@google.com> |
am daf63839: Merge "Keep pointers to extension values." * commit 'daf638399bd42122306786e8062f392ddace4363': Keep pointers to extension values.
|
daf638399bd42122306786e8062f392ddace4363 |
15-Jul-2014 |
Max Cai <maxtroy@google.com> |
Merge "Keep pointers to extension values."
|
a88808d414308b5b567d3afaab56fc338ad80667 |
15-Jul-2014 |
Max Cai <maxtroy@google.com> |
Merge "Fix access around unknownFieldData."
|
11f883e185a2ea6fd6d0b19520e9f0f004e90e5c |
15-Jul-2014 |
Max Cai <maxtroy@google.com> |
Fix access around unknownFieldData. Instead of publishing its class I chose to encapsulate the troublesome references in equals()/hashCode() in the generated code into superclass methods in ExtendableMessageNano. Changed a couple of java packages in the test suite to catch this issue easier in the future. Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
ava/pom.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_import_nano.proto
|
cf1b416ae1327a26dd53a691fc1b3e30eec8e6a6 |
17-Jun-2014 |
Juan Silveira <jjso@google.com> |
Keep pointers to extension values. The current implementation of getExtension deserialises the field from bytes and returns a new object every time. This means that changes to those objects are reflected when the messages is serialised unless setExtension is called. It also means that every call to getExtension and setExtension is expensive. This change introduces a FieldData class that contains everything that's known about the field at the time. This can be all the tag/byte[] pairs associated with a given field or an Extension and a value object. This is so that two messages with a repeated extension can be compared even if the extension has been deserialised in one of them but not the other. This change also adds FieldArray class based on SparseArray from the Android compatibility library. This is used in ExtendableMessageNano to make lookup of FieldDatas by their field number faster. Implications: * calling getExtension multiple times deserialises the field only once and returns the same object. * calling setExtension doesn't cause the object to be serialised immediately, that only happens when the container message is serialised. * getExtension is no longer a read-only thread-safe operation. README.txt has been updated to relfect that. * comparison using equals and hashCode continues to work. Bug: 10863158 Change-Id: I81c7cb0c73cc0611a1f7c1eabf5eed259738e8bc
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
ava/src/main/java/com/google/protobuf/nano/FieldData.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/test/java/com/google/protobuf/NanoTest.java
|
4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7 |
21-May-2014 |
Ying Wang <wangying@google.com> |
am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT * commit '403cc9277c5540cf14b6e53a4fedf3ae5499f4cf': You CANNOT change the global WITH_DEXPREOPT
|
f8b1f8314e84b8a174289c0ce492d154016fe7bd |
21-May-2014 |
Baligh Uddin <baligh@google.com> |
am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '39467629a7fb35da9fdfab4dd7603b9bfd7d9095':
|
403cc9277c5540cf14b6e53a4fedf3ae5499f4cf |
21-May-2014 |
Ying Wang <wangying@google.com> |
am 8eed3705: You CANNOT change the global WITH_DEXPREOPT * commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf': You CANNOT change the global WITH_DEXPREOPT
|
39467629a7fb35da9fdfab4dd7603b9bfd7d9095 |
21-May-2014 |
Baligh Uddin <baligh@google.com> |
am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':
|
8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf |
02-May-2014 |
Ying Wang <wangying@google.com> |
You CANNOT change the global WITH_DEXPREOPT Bug: 14380196 Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
ndroid.mk
|
6c915d3a1e820702dca08d02a40fb86aa2de0bdd |
21-May-2014 |
Baligh Uddin <baligh@google.com> |
keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
|
0301b7c5b305d6c4fc275291328416f77695e24b |
13-May-2014 |
Qiwen Zhao <zhao@google.com> |
reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81
|
f2750dcb61de785aee6aa75b7b002dac3f1581bb |
08-May-2014 |
Wink Saville <wink@google.com> |
am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '2b549b793713eb10b0212f1c5d6c90d9fdeead85': Revert "Merge commit 'e887563a' into fix-merge-conclict"
|
d1439291d0a2d6558903205676d41410c319587e |
08-May-2014 |
Wink Saville <wink@google.com> |
Revert "Merge commit 'e887563a' into fix-merge-conclict" This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80. Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
|
2b549b793713eb10b0212f1c5d6c90d9fdeead85 |
08-May-2014 |
Wink Saville <wink@google.com> |
Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
|
3ba4cb66d8d3c0daabaaedbdb13c0bacfd979b69 |
08-May-2014 |
Wink Saville <wink@google.com> |
Revert "Merge commit 'e887563a' into fix-merge-conclict" This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80. Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
67ebd315682b27dc0d2233eabe23bd8cbb481378 |
08-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '399cf8d641c0bad4cff016f3b1a02c63fb353a21':
|
0e54db6b8ac292b4193a924176a939d4326e803b |
08-May-2014 |
Bill Yi <byi@google.com> |
am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '8b5d62a4e819cb5114b294fc6754de63d50792b1':
|
cd8a72c726b398e3bea5dfcc07c1c9c40386511d |
08-May-2014 |
Jeff Davidson <jpd@google.com> |
am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master * commit '7b4e8c78004c479ffc99ec7c677e206cfdf8b73c':
|
3af26f43dc55563842cee8604f1e802bf40a2585 |
08-May-2014 |
Max Cai <maxtroy@google.com> |
am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit 'e69eaa2230952424fd410f3378445e78fcf58242':
|
90048528ee37be92be17cde8f351eb1b436cdc9e |
08-May-2014 |
Max Cai <maxtroy@google.com> |
am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '888cafe432fd2da8ae1b36429b5e8f822db11ce0':
|
16aad88f8a12afef0eea31709c8bc67f7c8bbdab |
08-May-2014 |
Wink Saville <wink@google.com> |
am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '13fb32b15d428e4633674b9bb8bb7d4750e7e909':
|
291f0484a489990b7d59a78b91792fa3d935eb5c |
08-May-2014 |
Wink Saville <wink@google.com> |
Merge commit 'f65ee555' into fix-merge-conflict * commit 'f65ee555': Change-Id: Ic1216c50b608f1609fd8a1a1a50209c4486f30a4
|
399cf8d641c0bad4cff016f3b1a02c63fb353a21 |
07-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':
|
8b5d62a4e819cb5114b294fc6754de63d50792b1 |
07-May-2014 |
Bill Yi <byi@google.com> |
am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'f4af48aeb5293a6c8583749e1a6f7a20508324f3':
|
7b4e8c78004c479ffc99ec7c677e206cfdf8b73c |
07-May-2014 |
Jeff Davidson <jpd@google.com> |
am 8113c186: resolved conflicts for merge of 592b6078 to master * commit '8113c1862afb4ff3b7ab4ba0044c5cb191c1e454':
|
e69eaa2230952424fd410f3378445e78fcf58242 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit '99c9801813fdc2eccd5db391c00d0250c327e344':
|
888cafe432fd2da8ae1b36429b5e8f822db11ce0 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'dd38a37eae035fe0f724438624694f1cf77a0ade':
|
13fb32b15d428e4633674b9bb8bb7d4750e7e909 |
07-May-2014 |
Wink Saville <wink@google.com> |
am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '3f1679bb03e1d08f08e7b4ca2d024345201d7f01':
|
f65ee55561e2a5f53be6db2ce03e518e249c9e80 |
07-May-2014 |
Wink Saville <wink@google.com> |
Merge commit 'e887563a' into fix-merge-conclict * commit 'e887563a': Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"" Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c
|
de6420aa3fef9f6f85e88fd8e0c7667230d81753 |
07-May-2014 |
Wink Saville <wink@google.com> |
am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'd89b3060b40d8485d02e48d11056750495ecb577':
|
c8f69926325e0653ba4244dbd041c2d29b784194 |
07-May-2014 |
Wink Saville <wink@google.com> |
am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '27243737cc739c25c8905cbe9b3040f500af127d':
|
9de5297388d67b5ddefdb3cf4e1f13a50f0a9c10 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." * commit 'e8f7a71c113c692102115cf56071e7c24cf09c88':
|
0eaea6a8d71e3b323f2fe3bccb3829162c04e33c |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '286f57055b99aa2c3c107f4cd8f49eeace8db5b5':
|
0ce2c26133762a55c52c0262bbe393370b806276 |
07-May-2014 |
Jie Dai <jied@google.com> |
am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':
|
d89b3060b40d8485d02e48d11056750495ecb577 |
07-May-2014 |
Wink Saville <wink@google.com> |
am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'f213b0c6a86503ad752139f04f343578df45db07':
|
27243737cc739c25c8905cbe9b3040f500af127d |
07-May-2014 |
Wink Saville <wink@google.com> |
am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':
|
e8f7a71c113c692102115cf56071e7c24cf09c88 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." * commit '9141054bc24597968ddb94fb466c07cd2a933706':
|
286f57055b99aa2c3c107f4cd8f49eeace8db5b5 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '5c3544dd69160dc00a7786977da220265a7c43c4':
|
c7a7b2acc57bea137e4f8066802d4b9264ea3275 |
07-May-2014 |
Jie Dai <jied@google.com> |
resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38
|
0c063c66604c5dee434534ff775eb6d18ce4ed7b |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit 'fa7bf363b9b46a933c3c3c81ff7f75684760fba8':
|
06396abfe648b84e4c17d0e4a98a6cd34d57aaab |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '2c210bb92ce2001e943b107710ba098295a55761':
|
e41d4c041cb2c6d58c4508cf792cd4e987991b2a |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit '0ea6895484185194b405af7bacfd1c6a0590d17c':
|
11b030c32e2b740283ddd455e1e29748667cf314 |
07-May-2014 |
Andrew Flynn <flynn@google.com> |
am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit 'db4556edf20010913f977322d1544bec77c9c181':
|
843619f3a85440e94d1cbec0f71173eb560d6d73 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '649efad8ca2fd4a4770fddca4537b8a3d27be47c':
|
175d44dbf967c326956f5ee11cfe72cbd571601c |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit 'aa721735628bd0affc98f3204729b39cceeb60d8':
|
bfa5ee2ff6bde25e15bcf855f60208c01bf7fd5e |
07-May-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '2f8797132c9bca0235d4e937768625f432647d00':
|
6a76a968d2c5c22a313dd2646d1b2941d17ff89d |
07-May-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'dee682fd34a78eb0335df215b72a7c5de6520170':
|
fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit '5645677fddfd957ca8460f81b634a7108e50bd36':
|
7630b4785d2675d37a272dc274318bd5a77c3805 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit 'f2d09988508c1aa6a2da63944036d21126ca82f8':
|
4d28b813b64ccc215cd462de7f33455abbe04d0b |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '5e0c3d21a0bd7065044b0b01b828940f5e1cb2a9':
|
fdf5bde4157bb3e5a5dc36d4acda930fd74933f1 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit '4ba333e8f251f9c8b27892452101ac31ffa38cae':
|
be303d0372ccf9e2fbc0abf238b925142ba0a8bf |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit 'd734d52f6ae689cd6efb768383056b5fb7ef3320':
|
2693b3aadbddaa28c4f9b4f3f11236b986f15557 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit '92d0bd2567355384de6c1b0f2662f6d0c0a94707':
|
a84e8aa6cd9b98e52d70d93ab10cbdf9c48c5a26 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit 'fc9db907250a8d8f3e60ba57d8073a6ca8169d36':
|
c45fb6a2338edd7c900fcd3612da79ec9d0a43e5 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit '6988e26be6d502789e7c1bed36e72873546d223a':
|
b2a7fc6b0585f3c53ea8110a8740141847f3394e |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit 'f97b9cedc0160a0c13ba18467b8b3b38746b64bb':
|
ab8cc07120d0fbb6ea4982459bc4238f0eea61bd |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit 'e4bf716d77655a9434de44442663682f2ba5fbc1':
|
aa2afb0865fa9c15dcaf657d13c5144186548320 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit 'caf351056c6ce99dd4000003d84774ad953877fe':
|
6ed6b682a2b93135e3f5cffc7e7627b879354c82 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit 'f593c0a51e5c901f9aa9d18857765f464808afee':
|
f7bbfdfd53b1fbe0073eaa2b132d358edae2b545 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit '4dfa34e224c3d961c0d84e3a3b848f01e55d746c':
|
ea95349d36ad1894fd68b23b04bc9a6422adeeb0 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit '90e065ddd7c3a620ee4f6160bf1227fdfe57a63f':
|
b624b3aa455ecf71c44bde4cf7488e7c199a0b8a |
07-May-2014 |
Wink Saville <wink@google.com> |
am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit '554bd9578e0c8ec4eea8130abaca7c91fdc46e61':
|
a6ddccbbac403dbe6fce5623768755c08d41c962 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':
|
a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit '2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f':
|
6d1e97097eca8f50e629c10fcabbffbe064868b8 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit 'a5df326138cdaf4874026c09e2967d8142eca811':
|
998ea484ba19563fd32ba3e2e16e785f449afa74 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit '194529f1952e4d873c8262e09a40ac71872859d2':
|
ede9a1f51eeff78ee4776858a17bda2d94e3edc5 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit '8c131d5bf75499455ce287aeb0af30030282a000':
|
67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066 |
07-May-2014 |
Adam Metcalf <gamblore@google.com> |
am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. * commit '4104f751dbabfc2dd04adee381aa4d949f81dbe1':
|
f3bf05831fdad617a7841d7943a9f6f5797582a8 |
07-May-2014 |
Wink Saville <wink@google.com> |
am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit '662d2f44e91af91a37a59f1fe1697a00b6b724c9':
|
2fb1789c06fa82f73d136d83189ad1a54043348d |
07-May-2014 |
Wink Saville <wink@google.com> |
am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded':
|
50ddd7addefb02ca23efd2f2c60442f91e276792 |
07-May-2014 |
Wink Saville <wink@google.com> |
am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '7022c115663ac6e24afdc896fc6f155f1a9bc52c':
|
05f45faa5951f5ae0d05e0a4a9f5249339df31b4 |
07-May-2014 |
Wink Saville <wink@google.com> |
am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'efa53b19f45400ca98c1bb2dc1f5bfa87be033df':
|
77140fb2a041eec2ef96cff59f8fa81c9355fcf3 |
07-May-2014 |
Wink Saville <wink@google.com> |
am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '211bb9125a78b3b8772afc196e16640a8b7f2f7b':
|
fa7bf363b9b46a933c3c3c81ff7f75684760fba8 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit '6a1f70ab855a3c222783596c92574267e3cfa6e8':
|
2c210bb92ce2001e943b107710ba098295a55761 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '6adb3df8b7d5f5deb42b6b4a9e7fe76638faa6fe':
|
0ea6895484185194b405af7bacfd1c6a0590d17c |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'a5273888480392ff8a8b0ea3af6617e18dbb1ed2':
|
db4556edf20010913f977322d1544bec77c9c181 |
07-May-2014 |
Andrew Flynn <flynn@google.com> |
am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '81d0f437ba2bb34cd59a019c2f15f862a9c5d45b':
|
649efad8ca2fd4a4770fddca4537b8a3d27be47c |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '55c3d6d9fa8287676c6502ad20199bd932730681':
|
aa721735628bd0affc98f3204729b39cceeb60d8 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '7c0eadd45cb4e0fef8afffe1626c2e4711418b49':
|
2f8797132c9bca0235d4e937768625f432647d00 |
07-May-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit 'da929e3ea6310e7dc46745f191200afc489600e6':
|
dee682fd34a78eb0335df215b72a7c5de6520170 |
07-May-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit '6597e4f210be48b731e995c6c9950046ccf7689b':
|
5645677fddfd957ca8460f81b634a7108e50bd36 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'b3ad7eaeb3233d9842a74e2252efa189d4c0524a':
|
f2d09988508c1aa6a2da63944036d21126ca82f8 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '4115d56f3d03ca788a08a0a1eb6c79fa107550d3':
|
5e0c3d21a0bd7065044b0b01b828940f5e1cb2a9 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '139bd6ac80ca61f85796bded692eeb5bb932cfca':
|
4ba333e8f251f9c8b27892452101ac31ffa38cae |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit 'b88c1729d89e76b06ae3b87d90cae6ea36cfde90':
|
d734d52f6ae689cd6efb768383056b5fb7ef3320 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit '8eda9d3f991c62237a24e4d9f8e7f58df1687a86':
|
92d0bd2567355384de6c1b0f2662f6d0c0a94707 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit 'e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe':
|
fc9db907250a8d8f3e60ba57d8073a6ca8169d36 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '0610e6834fa213c026d91fab037a649613840f44':
|
6988e26be6d502789e7c1bed36e72873546d223a |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit '4b359335e94c44fa16b78c1406f3cd71b7fbf40b':
|
f97b9cedc0160a0c13ba18467b8b3b38746b64bb |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit '677d51bb86ca57654617dae9fe645995a1b22658':
|
e4bf716d77655a9434de44442663682f2ba5fbc1 |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit '8f903e123aff94f272aaae22e275924980433a47':
|
caf351056c6ce99dd4000003d84774ad953877fe |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit '0e5add1dd4a5ce73ff10b38307bae942be178d5b':
|
f593c0a51e5c901f9aa9d18857765f464808afee |
07-May-2014 |
Max Cai <maxtroy@google.com> |
am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit 'ee8847c131e91c718a0f4d2af73ec56d9fd24d81':
|
4dfa34e224c3d961c0d84e3a3b848f01e55d746c |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit 'dc8f4a8bc871cf1ba6a27eaf7f581a144571411a':
|
90e065ddd7c3a620ee4f6160bf1227fdfe57a63f |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit 'ca07ad9d617b3ebab5d66077413bdfc7673a2926':
|
554bd9578e0c8ec4eea8130abaca7c91fdc46e61 |
07-May-2014 |
Wink Saville <wink@google.com> |
am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit 'd6be7db044050f9941ff7b7a3e57af0565d4e53c':
|
e9a0bb712f71d60dfb4266f8e2f56fac3a488984 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit '5f8ef51529f07ae758ec4944759828a1414dbb7c':
|
2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit 'c1f9ebcefb026a84e369347ddc23a3e4c6e9c940':
|
a5df326138cdaf4874026c09e2967d8142eca811 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit 'c017bb8c147d30641b36e6d16b9133c0dd9e8453':
|
194529f1952e4d873c8262e09a40ac71872859d2 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit '6778e0a0198f602cab76daf6428a97292007dc71':
|
8c131d5bf75499455ce287aeb0af30030282a000 |
07-May-2014 |
Ulas Kirazci <ulas@google.com> |
am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit 'bbda8b10152bbdb7d6057724f0e3e197db9ec108':
|
4104f751dbabfc2dd04adee381aa4d949f81dbe1 |
07-May-2014 |
Adam Metcalf <gamblore@google.com> |
am 380d1b5a: Fix the merge conflict leftovers. * commit '380d1b5a78de07a081b36c890321ac61a0fced1a': Fix the merge conflict leftovers.
|
662d2f44e91af91a37a59f1fe1697a00b6b724c9 |
07-May-2014 |
Wink Saville <wink@google.com> |
am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit 'adfb09a08d450f356a69c74c0a80a3e4573e20b8':
|
66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded |
07-May-2014 |
Wink Saville <wink@google.com> |
am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'df9a6dffee90f5ff657265b415ee5eb9fb5e3960':
|
7022c115663ac6e24afdc896fc6f155f1a9bc52c |
07-May-2014 |
Wink Saville <wink@google.com> |
am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit 'ba363f1380e9b99e6606462b21febd2e4027e340':
|
efa53b19f45400ca98c1bb2dc1f5bfa87be033df |
07-May-2014 |
Wink Saville <wink@google.com> |
am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '4d7f9ad71771fff628e88d463af94b44457b7934':
|
211bb9125a78b3b8772afc196e16640a8b7f2f7b |
07-May-2014 |
Wink Saville <wink@google.com> |
am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit 'f105476adedac50be509ed36cbb187b92fca54d9':
|
165d4d7e343099e4b84137b852a0a2070c27bba4 |
02-May-2014 |
Ying Wang <wangying@google.com> |
am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1': You CANNOT change the global WITH_DEXPREOPT
|
bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1 |
02-May-2014 |
Ying Wang <wangying@google.com> |
am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit '94f522f907e3f34f70d9e7816b947e62fddbb267': You CANNOT change the global WITH_DEXPREOPT
|
94f522f907e3f34f70d9e7816b947e62fddbb267 |
02-May-2014 |
Ying Wang <wangying@google.com> |
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit '49512cb01065b41c0113248c2c02800de1156d50': You CANNOT change the global WITH_DEXPREOPT
|
49512cb01065b41c0113248c2c02800de1156d50 |
02-May-2014 |
Ying Wang <wangying@google.com> |
Merge "You CANNOT change the global WITH_DEXPREOPT"
|
eaa37c503adff80aa6a99d1503bd0d0343a93a23 |
02-May-2014 |
Ying Wang <wangying@google.com> |
You CANNOT change the global WITH_DEXPREOPT Bug: 14380196 Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
ndroid.mk
|
1fd235cbb5975e117909c73e5e3a579ae4c28dce |
01-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '70eec2cabb5fa7bf8d7d492ec46905dae3df5a76': Fix NPE when clearing an extension in nano protos
|
70eec2cabb5fa7bf8d7d492ec46905dae3df5a76 |
01-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '58eb8e98d17971273548930a7e8d45e69995a2c8': Fix NPE when clearing an extension in nano protos
|
58eb8e98d17971273548930a7e8d45e69995a2c8 |
01-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit 'd20f0a4260763531acf5de677e4830afe0bfc53e': Fix NPE when clearing an extension in nano protos
|
d20f0a4260763531acf5de677e4830afe0bfc53e |
01-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
Merge "Fix NPE when clearing an extension in nano protos"
|
1ee2760aed05bf072a05fd7b6aeb158691a5dfbc |
01-May-2014 |
Jan-Willem Maarse <maarse@google.com> |
Fix NPE when clearing an extension in nano protos If ExtendableMessageNano doesn't have any unknown fields, trying to clear an extension by setting it to null would throw an NPE. Change-Id: I6abcdfcc0193de44f97b21dd6cc2f40604938a1a
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/test/java/com/google/protobuf/NanoTest.java
|
f4af48aeb5293a6c8583749e1a6f7a20508324f3 |
30-Apr-2014 |
Bill Yi <byi@google.com> |
am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '9dde6a6d6b6f8e0a96fd3634f7e033fc30bc11e5':
|
9dde6a6d6b6f8e0a96fd3634f7e033fc30bc11e5 |
30-Apr-2014 |
Bill Yi <byi@google.com> |
am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce':
|
ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce |
29-Apr-2014 |
Bill Yi <byi@google.com> |
Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEAD
|
8113c1862afb4ff3b7ab4ba0044c5cb191c1e454 |
26-Apr-2014 |
Jeff Davidson <jpd@google.com> |
resolved conflicts for merge of 592b6078 to master Change-Id: I4c9cebcc6922a970daca2af002c96bc7e8e102b8
|
592b60785ff2c47bd14df4b213b648587f93faef |
26-Apr-2014 |
Jeff Davidson <jpd@google.com> |
am 33a6680a: Merge "Support generation of Parcelable nano messages." * commit '33a6680ab98977cd5b9b7b03f4875b9265cfec3b': Support generation of Parcelable nano messages.
|
33a6680ab98977cd5b9b7b03f4875b9265cfec3b |
26-Apr-2014 |
Jeff Davidson <jpd@google.com> |
Merge "Support generation of Parcelable nano messages."
|
721ea491a8e3e9ea5a130965dc5761fc335c3e61 |
23-Apr-2014 |
Jeff Davidson <jpd@google.com> |
Support generation of Parcelable nano messages. This CL adds the "parcelable_messages" option. When enabled, all generated message classes will conform to the Android Parcelable contract. This is achieved by introducing a new parent class for generated classes which implements the required functionality. Since the store_unknown_fields option also makes use of a superclass, ExtendableMessageNano, we have two versions of the new Parcelable superclass: one extending MessageNano, and one extending ExtendableMessageNano. These classes are otherwise identical. As these classes depend on Android framework jars, they are not included in the host .jar build of the nanoproto library. Finally, add a test suite for running tests of Android-specific functionality, as this cannot be done on a desktop JVM. Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497
ndroid.mk
uild.gradle
ava/README.txt
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelingUtil.java
ava/src/device/test/AndroidManifest.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
|
99c9801813fdc2eccd5db391c00d0250c327e344 |
24-Apr-2014 |
Max Cai <maxtroy@google.com> |
am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit '43365182bcd23a011476fb5e57930f1829da41fa': Adds --ignore_service nano proto compiler flag
|
43365182bcd23a011476fb5e57930f1829da41fa |
24-Apr-2014 |
Max Cai <maxtroy@google.com> |
am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit '829f6c014ce69d04593d30652c8acc2f7a793851': Adds --ignore_service nano proto compiler flag
|
829f6c014ce69d04593d30652c8acc2f7a793851 |
24-Apr-2014 |
Max Cai <maxtroy@google.com> |
Merge "Adds --ignore_service nano proto compiler flag"
|
a0a4f14521bd29a472d51fb7c4c5c45a82643453 |
21-Apr-2014 |
Jie Dai <jied@google.com> |
Adds --ignore_service nano proto compiler flag Nano proto compiler normally throws an error if any service is defined. If --ignore-services=true is set, no error is thrown and the service is simply skipped. Change-Id: Id82583555085cc55550d03a485d3f0189885240b
ava/README.txt
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
|
dd38a37eae035fe0f724438624694f1cf77a0ade |
14-Apr-2014 |
Max Cai <maxtroy@google.com> |
am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '0391f00be135d1a52052d50171c38e9f0129031d': Don't reset cachedSize to 0 in getSerializedSize
|
0391f00be135d1a52052d50171c38e9f0129031d |
14-Apr-2014 |
Max Cai <maxtroy@google.com> |
am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'ea68d73c08b3b9319faef8ef9cd283e773a6ef20': Don't reset cachedSize to 0 in getSerializedSize
|
ea68d73c08b3b9319faef8ef9cd283e773a6ef20 |
14-Apr-2014 |
Max Cai <maxtroy@google.com> |
Merge "Don't reset cachedSize to 0 in getSerializedSize"
|
c82101204dcde798f870d95e91f5483c3e57eb29 |
20-Mar-2014 |
Dave Hawkey <dhawkey@google.com> |
Don't reset cachedSize to 0 in getSerializedSize This avoids a race-condition when cachedSize is momentarily set to 0 for non-empty messages if multiple threads call getSerializedSize (e.g. during serialization). This is a retry of https://android-review.googlesource.com/#/c/88570/. getSerializedSize() has been kept non-final so that messages generated with a previous version of the compiler will not break. Change-Id: I8d8154a10938cde579ae19c55eae55b1e70e0bda
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
3f1679bb03e1d08f08e7b4ca2d024345201d7f01 |
24-Mar-2014 |
Wink Saville <wink@google.com> |
am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '8a9fc09c92cf0b1f08186c9339952e47eddee74b': Revert "Don't reset cachedSize to 0 in getSerializedSize"
|
ba89934bdae7f4256c94a0a24992903a114e764f |
22-Mar-2014 |
Wink Saville <wink@google.com> |
am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860': Revert "Don't reset cachedSize to 0 in getSerializedSize"
|
8a9fc09c92cf0b1f08186c9339952e47eddee74b |
22-Mar-2014 |
Wink Saville <wink@google.com> |
am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860': Revert "Don't reset cachedSize to 0 in getSerializedSize"
|
ce2f59915e0b41c935e3f72a2b7b71b6c19b6860 |
22-Mar-2014 |
Wink Saville <wink@google.com> |
Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""
|
2d849337400b64ee913ece4631d3b2dbc95f20d8 |
22-Mar-2014 |
Wink Saville <wink@google.com> |
Revert "Don't reset cachedSize to 0 in getSerializedSize" This reverts commit c6e12c6702ca764486f952654ba1568f00efe813.
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
e887563af628efea8f49b1393d30c33107b198e0 |
22-Mar-2014 |
Wink Saville <wink@google.com> |
Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"" This reverts commit f213b0c6a86503ad752139f04f343578df45db07, reversing changes made to 1a4b1d52e44104f2e10d0cdc585dde88602843d2.
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
f213b0c6a86503ad752139f04f343578df45db07 |
22-Mar-2014 |
Wink Saville <wink@google.com> |
am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '5b931dc798d882754f3e7a876fc6d820fa371e95': Don't reset cachedSize to 0 in getSerializedSize
|
5b931dc798d882754f3e7a876fc6d820fa371e95 |
21-Mar-2014 |
Wink Saville <wink@google.com> |
am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797': Don't reset cachedSize to 0 in getSerializedSize
|
824ee2bfab83d1fbe725d4c23e86161592218954 |
21-Mar-2014 |
Wink Saville <wink@google.com> |
am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797': Don't reset cachedSize to 0 in getSerializedSize
|
ec0b12c34a6329d2f98003e9102fe2d75726c797 |
21-Mar-2014 |
Wink Saville <wink@google.com> |
Merge "Don't reset cachedSize to 0 in getSerializedSize"
|
c6e12c6702ca764486f952654ba1568f00efe813 |
20-Mar-2014 |
Dave Hawkey <dhawkey@google.com> |
Don't reset cachedSize to 0 in getSerializedSize This avoids a race-condition when cachedSize is momentarily set to 0 for non-empty messages if multiple threads call getSerializedSize (e.g. during serialization). Change-Id: I15a8ded92edbf41bf1c8d787960c5bbbc8a323c5
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
d816355844c620fa1353291d07d23c5bf274d6bd |
08-Mar-2014 |
Wink Saville <wink@google.com> |
am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074': Fix compile error on mac 10.9
|
5ef399084ba423f9d842bc4ee2d2986b2879d705 |
07-Mar-2014 |
Max Cai <maxtroy@google.com> |
am afc1553a: Merge "Extension overhaul." * commit 'afc1553a9eb56eff742828c9c819eafa363cdcc9': Extension overhaul.
|
c235d777f0f442b8f2e7a4a7389341524c7c64ae |
07-Mar-2014 |
Max Cai <maxtroy@google.com> |
am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '447f664aef6694bb9fb3db85d6166d908cde8a8d': Fix repeated packed field merging code for non-packed data. Add validation when parsing enum fields.
|
1a4b1d52e44104f2e10d0cdc585dde88602843d2 |
21-Feb-2014 |
Wink Saville <wink@google.com> |
am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '0031029939c440e42e8e43cea3401f135c1af7d6': Fix compile error on mac 10.9
|
0031029939c440e42e8e43cea3401f135c1af7d6 |
21-Feb-2014 |
Wink Saville <wink@google.com> |
am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074': Fix compile error on mac 10.9
|
51ef8f39de376fe71ce5d2c682abe4f974cf8074 |
21-Feb-2014 |
Wink Saville <wink@google.com> |
Merge "Fix compile error on mac 10.9"
|
f03ad1a96ff9a713e26eccebad15c5ecd76ca911 |
21-Feb-2014 |
Wink Saville <wink@google.com> |
Fix compile error on mac 10.9 Add #<include> istream to message.cc which was the solution to this bug: https://code.google.com/p/protobuf/issues/detail?id=570 Change-Id: Ic63730fdbe73234bf7efdd50ff0b55bb11ca0fd4
rc/google/protobuf/message.cc
|
9141054bc24597968ddb94fb466c07cd2a933706 |
17-Feb-2014 |
Max Cai <maxtroy@google.com> |
am 214997ce: am afc1553a: Merge "Extension overhaul." * commit '214997cefa5554c3670ea76293bbf751111704e4': Extension overhaul.
|
214997cefa5554c3670ea76293bbf751111704e4 |
17-Feb-2014 |
Max Cai <maxtroy@google.com> |
am afc1553a: Merge "Extension overhaul." * commit 'afc1553a9eb56eff742828c9c819eafa363cdcc9': Extension overhaul.
|
afc1553a9eb56eff742828c9c819eafa363cdcc9 |
17-Feb-2014 |
Max Cai <maxtroy@google.com> |
Merge "Extension overhaul."
|
5c3544dd69160dc00a7786977da220265a7c43c4 |
10-Feb-2014 |
Max Cai <maxtroy@google.com> |
am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '5d33d23ded77a145f59a915f19044aa14335d93b': Fix repeated packed field merging code for non-packed data. Add validation when parsing enum fields.
|
5d33d23ded77a145f59a915f19044aa14335d93b |
10-Feb-2014 |
Max Cai <maxtroy@google.com> |
am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '447f664aef6694bb9fb3db85d6166d908cde8a8d': Fix repeated packed field merging code for non-packed data. Add validation when parsing enum fields.
|
447f664aef6694bb9fb3db85d6166d908cde8a8d |
10-Feb-2014 |
Max Cai <maxtroy@google.com> |
Merge changes I9fecff3c,I2c1eb07f * changes: Fix repeated packed field merging code for non-packed data. Add validation when parsing enum fields.
|
f4523ddb8a4e6f1008bfec2ee9e39629be792639 |
16-Jan-2014 |
Max Cai <maxtroy@google.com> |
Fix repeated packed field merging code for non-packed data. Enum fix is already included in the previous commit. Bug: https://code.google.com/p/android/issues/detail?id=64893 Change-Id: I9fecff3c8822918a019028eb57fa39b361a2c960
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
d888895a3b5cf764856d3a94ed526bf9994c1800 |
15-Jan-2014 |
Max Cai <maxtroy@google.com> |
Add validation when parsing enum fields. Invalid values from the wire are silently ignored. Unlike full/lite, the invalid values are not stored into the unknown fields, because there's no way to get them out from Nano's unknown fields without a matching Extension. Edited README and slightly moved it towards a standalone section for Nano, independent of the Micro section. Change-Id: I2c1eb07f4d6d8f3aea242b8ddd95b9c966f3f177
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/unittest_enum_validity_nano.proto
|
6965d8913f45eb8a7cb0711dea4301fc75c4ee1b |
15-Jan-2014 |
Jie Dai <jied@google.com> |
Modify the gradle file to fit code hierachy with package name Change-Id: I99adc3c857d7851b8d99e01c75c15e9c42c37eb7
uild.gradle
|
6a1f70ab855a3c222783596c92574267e3cfa6e8 |
14-Jan-2014 |
Max Cai <maxtroy@google.com> |
am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit 'd5219df3ce036d4f43262bbda1016097a59a0c81': Allow whitespace in nano codegen options.
|
d5219df3ce036d4f43262bbda1016097a59a0c81 |
14-Jan-2014 |
Max Cai <maxtroy@google.com> |
am a8af729b: Merge "Allow whitespace in nano codegen options." * commit 'a8af729b5ef822971f025a7e8ff197545986910d': Allow whitespace in nano codegen options.
|
a8af729b5ef822971f025a7e8ff197545986910d |
14-Jan-2014 |
Max Cai <maxtroy@google.com> |
Merge "Allow whitespace in nano codegen options."
|
4109e91ce6035f84fa32b2e949501befbfb90159 |
14-Jan-2014 |
Max Cai <maxtroy@google.com> |
Allow whitespace in nano codegen options. So we don't need to keep all option in a single line in the .mk files. Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
ndroid.mk
ava/README.txt
ava/pom.xml
rc/google/protobuf/compiler/javanano/javanano_generator.cc
|
6adb3df8b7d5f5deb42b6b4a9e7fe76638faa6fe |
13-Jan-2014 |
Max Cai <maxtroy@google.com> |
am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '1be96c579a34924bd20f19a0911b101ade08b0f3': Correctness: floating point equality using bits instead of ==.
|
a5273888480392ff8a8b0ea3af6617e18dbb1ed2 |
13-Jan-2014 |
Max Cai <maxtroy@google.com> |
am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit '538abc5b6514460fce1e72da9f49591c6d4ba2e0': Don't serialize required fields whose 'has' flags are unset.
|
1be96c579a34924bd20f19a0911b101ade08b0f3 |
13-Jan-2014 |
Max Cai <maxtroy@google.com> |
am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '4b5874fad099faefb469c632e4c7b854cea733ae': Correctness: floating point equality using bits instead of ==.
|
538abc5b6514460fce1e72da9f49591c6d4ba2e0 |
13-Jan-2014 |
Max Cai <maxtroy@google.com> |
am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'd6aeae143cde31b79a2d57a3ee0e41d9083d232d': Don't serialize required fields whose 'has' flags are unset.
|
4b5874fad099faefb469c632e4c7b854cea733ae |
13-Jan-2014 |
Max Cai <maxtroy@google.com> |
Merge "Correctness: floating point equality using bits instead of ==."
|
d6aeae143cde31b79a2d57a3ee0e41d9083d232d |
13-Jan-2014 |
Max Cai <maxtroy@google.com> |
Merge "Don't serialize required fields whose 'has' flags are unset."
|
04e0fa44e105bc644bf07ba5154fc4a1ca4baec2 |
09-Jan-2014 |
Max Cai <maxtroy@google.com> |
Correctness: floating point equality using bits instead of ==. Special values for float and double make it inaccurate to test the equality with ==. The main Java library uses the standard Object.equals() implementation for all fields, which for floating point fields means Float.equals() or Double.equals(). They define equality as bitwise equality, with all NaN representations normalized to the same bit sequence (and therefore equal to each other). This test checks that the nano implementation complies with Object.equals(), so NaN == NaN and +0.0 != -0.0. Change-Id: I97bb4a3687223d8a212c70cd736436b9dd80c1d7
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_accessors_nano.proto
rc/google/protobuf/unittest_has_nano.proto
|
f84177299a76759be1eb925093b059aef246fc0e |
10-Jan-2014 |
Max Cai <maxtroy@google.com> |
Don't serialize required fields whose 'has' flags are unset. Change-Id: Ibbe944fff83e44a8f2206e18ee9ec6f10661297a
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_has_nano.proto
|
382ddccb550e1c822ef26a0e65988998f7446624 |
20-Nov-2013 |
Max Cai <maxtroy@google.com> |
Extension overhaul. - Get rid of TypeLiteral<T>. It was introduced to read the component type of a List<T> at runtime. But we use arrays everywhere else, and we can always read the component type of an array type at runtime. - Properly read/write "minor" types (e.g. sint32, sfixed32). The old implementation could only read/write data as the "typical" types (one per Java type), e.g. java.lang.Integer -> int32, java.lang.Long -> int64. So if e.g. an extension specifies sfixed32 as the type, it would be read/written in the totally incompatible int32 format. - Properly serialize repeated packed fields. The old implementation doesn't do packed serialization. As an added bonus, and to be more aligned with the rest of protobuf nano / main, repeated packable extensions can deserialize both packed and non-packed data. - Split Extension class into a hierarchy so under typical usage a large chunk of code dealing with primitive type extensions can be removed by ProGuard. Bug: https://code.google.com/p/android/issues/detail?id=62586 Change-Id: I0d692f35cc2a8ad3a5a1cb3ce001282b2356b041
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_extension_packed_nano.proto
rc/google/protobuf/unittest_extension_repeated_nano.proto
rc/google/protobuf/unittest_extension_singular_nano.proto
|
81d0f437ba2bb34cd59a019c2f15f862a9c5d45b |
19-Dec-2013 |
Andrew Flynn <flynn@google.com> |
am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit 'a896c1d8699a3a14aae94b7067339ebc5cccc794': Fix MessageNanoPrinter for accessors
|
a896c1d8699a3a14aae94b7067339ebc5cccc794 |
19-Dec-2013 |
Andrew Flynn <flynn@google.com> |
am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit 'e7741c064ee4cdc5fa41e6444ed45131672fed97': Fix MessageNanoPrinter for accessors
|
e7741c064ee4cdc5fa41e6444ed45131672fed97 |
19-Dec-2013 |
Andrew Flynn <flynn@google.com> |
Merge "Fix MessageNanoPrinter for accessors"
|
6b594c228e7954eb98353ad8e242b83fb255a277 |
12-Dec-2013 |
Andrew Flynn <flynn@google.com> |
Fix MessageNanoPrinter for accessors accessors mode switches proto fields away from being public fields (which is how MessageNanoPrinter found which fields to print via reflection). Add a pass through the methods looking for generated accessor methods to print those as well. Change-Id: I7c47853ecbd5534086f44b25a89dbbe56f63ed03
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
|
55c3d6d9fa8287676c6502ad20199bd932730681 |
10-Dec-2013 |
Max Cai <maxtroy@google.com> |
am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '6b9d96b2a3b32c141e2b105fcfde4f4b0dfae3f5': Avoid class initializers to help ProGuard.
|
6b9d96b2a3b32c141e2b105fcfde4f4b0dfae3f5 |
10-Dec-2013 |
Max Cai <maxtroy@google.com> |
am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '3f9bd9989c79db575b83e2f96b48c695f30ca153': Avoid class initializers to help ProGuard.
|
3f9bd9989c79db575b83e2f96b48c695f30ca153 |
10-Dec-2013 |
Max Cai <maxtroy@google.com> |
Merge "Avoid class initializers to help ProGuard."
|
5cc242074f189837b38e7768b57ccfb0bca258df |
09-Oct-2013 |
Max Cai <maxtroy@google.com> |
Avoid class initializers to help ProGuard. Class initializers prevent ProGuard from inlining any methods because it thinks the class initializer may have side effects. This is true for static methods, but instance methods can still be inlined, because to have an instance you will have touched the class and any class initializers would have run. But ProGuard only starts inlining instance methods of classes with class initializers from v4.11b6, and Android uses v4.4 now. This change tries to avoid the class initializers as much as possible, by delaying the initialization of the empty array and some fields' saved defaults until when they're needed. However, if the message hosts any extensions, they must be public static final and therefore introducing the class initializer. In that case we won't bother with lazy initialization. Change-Id: I00d8296f6eb0023112b93ee135cdb28dbd52b0b8
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
|
7c0eadd45cb4e0fef8afffe1626c2e4711418b49 |
10-Dec-2013 |
Max Cai <maxtroy@google.com> |
am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '6a6b3b384c6084b3ce0de360b6dcb74a82bc23bb': Nano: don't generate accessor methods for nested methods
|
6a6b3b384c6084b3ce0de360b6dcb74a82bc23bb |
10-Dec-2013 |
Max Cai <maxtroy@google.com> |
am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit 'cea499acf68b35921b956785c26c0e6f18c241c1': Nano: don't generate accessor methods for nested methods
|
cea499acf68b35921b956785c26c0e6f18c241c1 |
10-Dec-2013 |
Max Cai <maxtroy@google.com> |
Merge "Nano: don't generate accessor methods for nested methods"
|
102cfe65b9b9e2b458c3d0ec69d47e8fc40dc726 |
04-Dec-2013 |
Andrew Flynn <flynn@google.com> |
Nano: don't generate accessor methods for nested methods For nested message objects, don't generate accessor methods because they have a default value that is not a valid value (null), so there is no reason to have get/set/has/clear methods for them. Clients and protos (while serializing) can check against the invalid value to see if it's been set. Change-Id: Ic63400889581271b8cbcd9c45c84519d4921fd4b
ava/README.txt
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
|
da929e3ea6310e7dc46745f191200afc489600e6 |
06-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '98c9208a616a97adf00bf1b3265e0f589c191d95':
|
98c9208a616a97adf00bf1b3265e0f589c191d95 |
06-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit 'b6089cca5248f19832dde54faaad62891ff8bd25':
|
b6089cca5248f19832dde54faaad62891ff8bd25 |
05-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEAD
|
6597e4f210be48b731e995c6c9950046ccf7689b |
23-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit '485b7645fea855d55b281185c7299ee9d7ab7f9a':
|
485b7645fea855d55b281185c7299ee9d7ab7f9a |
23-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'c4c4a562672068fb89ea4e65408dd53de2ed8f1f':
|
c4c4a562672068fb89ea4e65408dd53de2ed8f1f |
22-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEAD
|
b3ad7eaeb3233d9842a74e2252efa189d4c0524a |
21-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit '0143d32d6ff0aad17873b486966c7a58efa04811': Align with main: two ways of parsing repeated packable fields.
|
0143d32d6ff0aad17873b486966c7a58efa04811 |
21-Nov-2013 |
Max Cai <maxtroy@google.com> |
am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'f5271c9ca4a237221c0ba722dc548050ad131064': Align with main: two ways of parsing repeated packable fields.
|
f5271c9ca4a237221c0ba722dc548050ad131064 |
18-Nov-2013 |
Max Cai <maxtroy@google.com> |
Merge "Align with main: two ways of parsing repeated packable fields."
|
fea3fd5cb6ff88b51da60b1f33004944d93a9fce |
13-Nov-2013 |
Max Cai <maxtroy@google.com> |
Align with main: two ways of parsing repeated packable fields. It is a requirement for parsing code to handle packed and unpacked forms on the wire for repeated packable fields. This change aligns the javanano's behavior with the java's. Bonus: optimize array length calculation when parsing repeated fixed-size-element-type fields. Bonus 2: lose "xMemoizedSerializedSize" for repeated enum fields, and make the serialized size calculation match that for repeated int32 fields. Change-Id: I8a06103d9290234adb46b0971b5ed155544fe86a
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_repeated_packables_nano.proto
|
4115d56f3d03ca788a08a0a1eb6c79fa107550d3 |
15-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac': Update MessageNano#toString() to return mostly valid TextFormat.
|
0afd5a4d782037ea641d75d595cf5d38ed6978ac |
15-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '3e0d99fab8c1da2a8f36637b7bf5e8581143e36a': Update MessageNano#toString() to return mostly valid TextFormat.
|
3e0d99fab8c1da2a8f36637b7bf5e8581143e36a |
15-Nov-2013 |
Max Cai <maxtroy@google.com> |
Merge "Update MessageNano#toString() to return mostly valid TextFormat."
|
62a22a732fb134e5f34dd3e01920933ca5b16346 |
10-Nov-2013 |
Nicholas Seckar <seckar@google.com> |
Update MessageNano#toString() to return mostly valid TextFormat. The output of toString is now aligned with that used by non-nano and C++ runtimes, with the exception of groups. Groups should be serialized using a camelized name (e.g. "FooBar" rather than "foo_bar") however the nano runtime does not have information on which fields are groups. Changes are: - bytes fields are output within double-quotes, non-printable characters are output as octal escape sequences (i.e. \NNN); - field identifiers are output in underscored format; - unset fields are not output (rather than printing "null"); - the type name of the root message is not output. With these changes the nano toString, normal toString, and C++'s DebugString all produce equivalent output when given the same message. (Provided that message uses no deprecated features.) Change-Id: Id4791d73822846db29344db9f7bc3781c3e183a6
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
|
139bd6ac80ca61f85796bded692eeb5bb932cfca |
15-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '382a066aa300b51cfd96c83ad53c49ce496d9d5c': Fix warnings warnings in header files, hide others.
|
382a066aa300b51cfd96c83ad53c49ce496d9d5c |
15-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '332076f08a9d46b772fee755832a0e09dd8cb6aa': Fix warnings warnings in header files, hide others.
|
332076f08a9d46b772fee755832a0e09dd8cb6aa |
15-Nov-2013 |
Max Cai <maxtroy@google.com> |
Merge "Fix warnings warnings in header files, hide others."
|
cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b |
13-Nov-2013 |
Kristian Monsen <kristianm@google.com> |
Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
ndroid.mk
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/wire_format_lite_inl.h
|
b88c1729d89e76b06ae3b87d90cae6ea36cfde90 |
12-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit '77e9fbd32c2732063a479acb50143a388a2321f0': Minimize method count for nanoproto.
|
77e9fbd32c2732063a479acb50143a388a2321f0 |
12-Nov-2013 |
Max Cai <maxtroy@google.com> |
am ac8e2e15: Merge "Minimize method count for nanoproto." * commit 'ac8e2e150716784a707587ae6e2c8b3a291a2ae7': Minimize method count for nanoproto.
|
ac8e2e150716784a707587ae6e2c8b3a291a2ae7 |
12-Nov-2013 |
Max Cai <maxtroy@google.com> |
Merge "Minimize method count for nanoproto."
|
7e02f374901ff471db5140f415de157ac6243050 |
11-Nov-2013 |
Tom Chao <chaot@google.com> |
Minimize method count for nanoproto. - Migrates getCachedSize to the MessageNano parent class to save one method per message. - Create ExtendableMessageNano parent class for protos with extensions, this saves the getExtension and setExtension methods on the relevant messages. - getSerializedSize's default case (with no fields to serialize) also migrate to the parent class, which saves methods on empty messages. - Container classes become interfaces to save the constructor. Change-Id: I81f1a1b6d6a660096835e9df3ea20456655aab4a
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
8eda9d3f991c62237a24e4d9f8e7f58df1687a86 |
07-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit '42b5c369cd0559025938d07c73ca51d1c0c32f2e': Allow for ref-type arrays containing null elements.
|
42b5c369cd0559025938d07c73ca51d1c0c32f2e |
07-Nov-2013 |
Max Cai <maxtroy@google.com> |
am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit '8a15121c1077fe883f428bd27dee6b99e06e48b6': Allow for ref-type arrays containing null elements.
|
8a15121c1077fe883f428bd27dee6b99e06e48b6 |
06-Nov-2013 |
Max Cai <maxtroy@google.com> |
Merge "Allow for ref-type arrays containing null elements."
|
beb57e08a44a140bf52235717f1f907ca857f360 |
14-Aug-2013 |
Aurash Mahbod <aurash@google.com> |
Allow for ref-type arrays containing null elements. Strip the null elements out before serializing the array. This is helpful in the cases where the user wants to construct an array of an inexact size for serialization. For example: User constructs array of size 5 because they anticipate adding more than 1 element before serialization. Only 3 get added, so the array looks like [Obj, Obj, Obj, null, null]. This would curently crash without this CL. All repeated fields of ref-type elements can contain null elements: repeated strings, repeated bytes, and repeated messages/groups. Change-Id: I117391c868c9a436536d70d6151780e9cc7e8227 Conflicts: src/google/protobuf/compiler/javanano/javanano_message_field.cc
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe |
25-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit '72fa49d45452418ca7365b97af9e7d426d535916': Implement hashCode() and equals() behind a generator option.
|
72fa49d45452418ca7365b97af9e7d426d535916 |
25-Oct-2013 |
Max Cai <maxtroy@google.com> |
am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit 'bb971d53626cb286f8dc491c15d2731001c4891b': Implement hashCode() and equals() behind a generator option.
|
bb971d53626cb286f8dc491c15d2731001c4891b |
25-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge "Implement hashCode() and equals() behind a generator option."
|
ccc48faf20dbf3b3cddcffe78d198876d543529b |
16-Oct-2013 |
Brian Duff <bduff@google.com> |
Implement hashCode() and equals() behind a generator option. The option is only called 'generate_equals' because: - equals() is the main thing; hashCode() is there only to complement equals(); - it's shorter; - toString() should not be included in this option because it's more for debugging and it's more likely to stop ProGuard from working well. Also shortened the "has bit" expression; was ((bitField & mask) == mask), now ((bitField & mask) != 0). Both the Java code and the bytecode are slightly shorter. Change-Id: Ic309a08a60883bf454eb6612679aa99611620e76
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
|
0610e6834fa213c026d91fab037a649613840f44 |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '7cb6b37f3799affce9e1be39977d4419283df795': Feature request: set() and clear() accessors return this
|
7cb6b37f3799affce9e1be39977d4419283df795 |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '42be1e79ccd670be36220222936aa7cacc6856f6': Feature request: set() and clear() accessors return this
|
42be1e79ccd670be36220222936aa7cacc6856f6 |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge "Feature request: set() and clear() accessors return this"
|
b15a1b379f896e371ca3375bdf51dd4a9a0268af |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
Feature request: set() and clear() accessors return this Also pre-inlines set() and has() in serialization code. This could theoretically help ProGuard: the message class size is usually large, and because of this only, it may refuse to inline an accessor into the serialization code, and as a result keeps the accessor intact. Chances are, after pre-inlining all accessor calls within the message class, those accessors become unused or single-use, so there are more reasons for ProGuard to inline and then remove them. Change-Id: I57decbe0b2533c1be21439de0aad15f49c7024dd
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
4b359335e94c44fa16b78c1406f3cd71b7fbf40b |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit 'd52f7a3e2f3d4dba9b8c134dc2fa2a54ddd1ce17': Make generated code more aligned with Google Java style.
|
d52f7a3e2f3d4dba9b8c134dc2fa2a54ddd1ce17 |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit 'c50f605c572a425b2fa696fedc5e61ac6f66d2a9': Make generated code more aligned with Google Java style.
|
c50f605c572a425b2fa696fedc5e61ac6f66d2a9 |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge "Make generated code more aligned with Google Java style."
|
286271f75aa6ff1f3746379b77d6dc55415baa16 |
14-Oct-2013 |
Max Cai <maxtroy@google.com> |
Make generated code more aligned with Google Java style. - Blank line after opening a message class (but not an enum interface). - Let all code blocks insert blank lines before themselves. This applies to 'package' statement, all message classes, enum classes or constant groups, extensions, bitfields, proto fields (one block per field; i.e. accessors don't have blank lines among them), and basic MessageNano methods. In this case we don't need to guess what the next block is and create blank lines for it. - Fixed some newline/indent errors. - Only one SuppressWarnings("hiding") per file. Change-Id: I865f52ad4fb6ea3b3a98b97ac9d78d19fc46c858
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
|
677d51bb86ca57654617dae9fe645995a1b22658 |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit '5b4b84a18dc04b1b6c931c42403731fa79eb213d': Fix repeated field merging semantics.
|
5b4b84a18dc04b1b6c931c42403731fa79eb213d |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
am afaf74ce: Merge "Fix repeated field merging semantics." * commit 'afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc': Fix repeated field merging semantics.
|
afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc |
16-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge "Fix repeated field merging semantics."
|
334a7d1117a576bc6010c14677fb6444639c1dda |
15-Oct-2013 |
Max Cai <maxtroy@google.com> |
Fix repeated field merging semantics. The public doc states that repeated fields are simply concatenated and doesn't impose a different semantics for packed fields. This CL fixes this for packed fields and adds tests covering all cases. Also fixed a bit of missed null-repeated-field treatments. Change-Id: Ie35277bb1a9f0b8171dc9d07b6adf9b9d3308de2
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_repeated_merge_nano.proto
|
8f903e123aff94f272aaae22e275924980433a47 |
15-Oct-2013 |
Max Cai <maxtroy@google.com> |
am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit 'bf222b76dc346d3946a701ba675a7c31833f81fc': Protect against null repeated fields.
|
bf222b76dc346d3946a701ba675a7c31833f81fc |
15-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 63e819ad: Merge "Protect against null repeated fields." * commit '63e819adbb4d2d8215f5d3d8297dc50bf2fe3329': Protect against null repeated fields.
|
63e819adbb4d2d8215f5d3d8297dc50bf2fe3329 |
15-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge "Protect against null repeated fields."
|
0e5add1dd4a5ce73ff10b38307bae942be178d5b |
15-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit '051ea13ce26ff0ff9dbc487c2b233b0159204e40':
|
051ea13ce26ff0ff9dbc487c2b233b0159204e40 |
15-Oct-2013 |
Max Cai <maxtroy@google.com> |
am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit 'c85806baedfc98ad5759a990b35ea5b5f1ac4edb':
|
e03e9f4b5774c0ffe04140d83bbdb532863b1720 |
09-Oct-2013 |
Brian Duff <bduff@google.com> |
Protect against null repeated fields. There's no distinction between a repeated field being null and being empty. In both cases, nothing is sent on the wire. Clients might for whatever reason inadvertently set a repeated field to null, so protect against that and treat it just as if the field was empty. Change-Id: Ic3846f7f2189d6cfff6f8ef3ca217daecc3c8be7
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
ee8847c131e91c718a0f4d2af73ec56d9fd24d81 |
11-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit '145af9e8915a5e814d5deba8bcea68d066dd7f9e': Remove all field initializers and let ctor call clear().
|
145af9e8915a5e814d5deba8bcea68d066dd7f9e |
11-Oct-2013 |
Max Cai <maxtroy@google.com> |
am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit '39cee9f1f5cd513a53ac5100eb208ed431f99af0': Remove all field initializers and let ctor call clear().
|
39cee9f1f5cd513a53ac5100eb208ed431f99af0 |
11-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge "Remove all field initializers and let ctor call clear()."
|
c85806baedfc98ad5759a990b35ea5b5f1ac4edb |
11-Oct-2013 |
Max Cai <maxtroy@google.com> |
Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomerge
|
5ae438cf71487d5bc8cb5c0d0e637f976734d110 |
11-Oct-2013 |
Max Cai <maxtroy@google.com> |
Remove all field initializers and let ctor call clear(). The field initializers have basically caused the compiled <init> method to inline the whole clear() method, which means if ProGuard is not used or failed to inline or remove clear(), there are two big chunks of code that do the same thing. So why not just call clear() from the ctor. Change-Id: Ief71e2b03db2e059b3bfa98309649368089ffab0
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
dc8f4a8bc871cf1ba6a27eaf7f581a144571411a |
10-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit '7457ebc9ae3eee30ccb44f259a14316e7d9ab950': Add missing README parts for enum_style and in-repo usage
|
7457ebc9ae3eee30ccb44f259a14316e7d9ab950 |
10-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit 'cbb08132821cb56f4e6c5e5f8a0b32f51879782a': Add missing README parts for enum_style and in-repo usage
|
cbb08132821cb56f4e6c5e5f8a0b32f51879782a |
10-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add missing README parts for enum_style and in-repo usage"
|
d91cb18cc224be53379fc083b37452a094307933 |
10-Oct-2013 |
Max Cai <maxtroy@google.com> |
Add missing README parts for enum_style and in-repo usage Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73
ava/README.txt
|
ca07ad9d617b3ebab5d66077413bdfc7673a2926 |
09-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit '570db0e9bdfb7c2696dcd6c31483223cc2d1c4f3': Add reftypes field generator option.
|
570db0e9bdfb7c2696dcd6c31483223cc2d1c4f3 |
09-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
am c4a1b547: Merge "Add reftypes field generator option." * commit 'c4a1b547c91178d79f5d2cc2e00b8be922c22fe8': Add reftypes field generator option.
|
c4a1b547c91178d79f5d2cc2e00b8be922c22fe8 |
09-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add reftypes field generator option."
|
d6be7db044050f9941ff7b7a3e57af0565d4e53c |
09-Oct-2013 |
Wink Saville <wink@google.com> |
am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit 'fdbd1e42d8fdfde0efc3ed3d31f0ee95f5e324ac': Fix some indenting issues with set__() function
|
fdbd1e42d8fdfde0efc3ed3d31f0ee95f5e324ac |
09-Oct-2013 |
Wink Saville <wink@google.com> |
am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit '44cbb06c725fbba00464bba9f19dc0ea295406b1': Fix some indenting issues with set__() function
|
44cbb06c725fbba00464bba9f19dc0ea295406b1 |
09-Oct-2013 |
Wink Saville <wink@google.com> |
Merge "Fix some indenting issues with set__() function"
|
5dca493053aa93bdd2b5dba842ad87d34ba31521 |
08-Oct-2013 |
Andrew Flynn <flynn@google.com> |
Fix some indenting issues with set__() function Previously it looked like this: public final class OuterClass { [...] public static final class InnerClass extends com.google.protobuf.nano.MessageNano { [...] public void setId(java.lang.String value) { if (value == null) { throw new java.lang.NullPointerException(); } id_ = value; bitfield0_ |= 0x00000001; [...] } [...] } Now it looks like this: public final class OuterClass { [...] public static final class InnerClass extends com.google.protobuf.nano.MessageNano { [...] public void setId(java.lang.String value) { if (value == null) throw new java.lang.NullPointerException(); id_ = value; bitfield0_ |= 0x00000001; [...] } [...] } Change-Id: I2a9289b528f785c846210d558206d677aa13e9be
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
0b8579237336f221711a0aac42400eb31a58fed3 |
01-Oct-2013 |
Brian Duff <bduff@google.com> |
Add reftypes field generator option. This option generates fields as reference types, and serializes based on nullness. Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5 Signed-off-by: Brian Duff <bduff@google.com>
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_reference_types_nano.proto
|
5f8ef51529f07ae758ec4944759828a1414dbb7c |
04-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit '0255eb04c74f86b9bd482d65331d6d8bb4eb3d18': Fix roundtrip failure with groups when unknown fields are enabled.
|
0255eb04c74f86b9bd482d65331d6d8bb4eb3d18 |
04-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit '9827c718c45cfa1744a3b0f8fc27dac9cd415603': Fix roundtrip failure with groups when unknown fields are enabled.
|
9827c718c45cfa1744a3b0f8fc27dac9cd415603 |
04-Oct-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Fix roundtrip failure with groups when unknown fields are enabled."
|
37ac79028de3d1cd8c215ba54fdf31e4eeca4b2c |
25-Sep-2013 |
Nicholas Seckar <seckar@google.com> |
Fix roundtrip failure with groups when unknown fields are enabled. When parsing a group, the group's end tag should not be stored within the message's unknownFieldData. Not only does this waste space, it is also output the next time the group is serialized, resulting in two end tags for that group. The resulting bytes are not always a valid protocol buffer and may fail to parse. This change ensures that group end tags do not result in an unknownFieldData entry, and that messages with groups can be roundtripped without corruption. Change-Id: I240f858a7217a7652b756598c34aacad5dcc3363 Conflicts: java/src/test/java/com/google/protobuf/NanoTest.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/unittest_extension_nano.proto
|
c1f9ebcefb026a84e369347ddc23a3e4c6e9c940 |
29-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit '8f93f123e2597ba9c02c2792abe180e63a0d9d5b': Implement enum_style=java option.
|
c017bb8c147d30641b36e6d16b9133c0dd9e8453 |
29-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit '3f85c84042611b1f412a73023da8dcd9858037c3': Accessor style for optional fields.
|
8f93f123e2597ba9c02c2792abe180e63a0d9d5b |
29-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 44dc2f1e: Merge "Implement enum_style=java option." * commit '44dc2f1eaead8d95d3f5a4f80f9da87852053bfb': Implement enum_style=java option.
|
3f85c84042611b1f412a73023da8dcd9858037c3 |
29-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 0d035e9b: Merge "Accessor style for optional fields." * commit '0d035e9b3485d26df106ff9118705d8476466674': Accessor style for optional fields.
|
44dc2f1eaead8d95d3f5a4f80f9da87852053bfb |
29-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Implement enum_style=java option."
|
0d035e9b3485d26df106ff9118705d8476466674 |
29-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Accessor style for optional fields."
|
26266cd4660ffe1f3d6015b715713ee654c5b936 |
24-Sep-2013 |
Max Cai <maxtroy@google.com> |
Implement enum_style=java option. This javanano_out command line option creates a container interface at the normal place where the enum constants would reside, per enum definition. The java_multiple_files flag would now affect the file- scope enums with the shells. If the flag is true then file-scope container interfaces are created in their own files. Change-Id: Id52258fcff8d3dee9db8f3d8022147a811bf3565
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/unittest_enum_class_multiple_nano.proto
rc/google/protobuf/unittest_enum_class_nano.proto
|
6778e0a0198f602cab76daf6428a97292007dc71 |
24-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit '2923f3d2d87c1acd41df5fa741d51c2bbafbd640': Add some bitfield helper methods from 2.4
|
2923f3d2d87c1acd41df5fa741d51c2bbafbd640 |
24-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit 'cc652daaec7fc6ebf8b12d361444364da257988b': Add some bitfield helper methods from 2.4
|
cc652daaec7fc6ebf8b12d361444364da257988b |
24-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add some bitfield helper methods from 2.4"
|
bbda8b10152bbdb7d6057724f0e3e197db9ec108 |
24-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit '081ac0fc81819ad6d124d4133e6d2e4037ca9c5b': Add two codegen parameters to nano.
|
081ac0fc81819ad6d124d4133e6d2e4037ca9c5b |
24-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit '9e6afdf96f98259f89aad66367954a247b3e7817': Add two codegen parameters to nano.
|
9e6afdf96f98259f89aad66367954a247b3e7817 |
24-Sep-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add two codegen parameters to nano."
|
e74fe623e115237968a3de1143d7cdb4df710858 |
20-Sep-2013 |
Max Cai <maxtroy@google.com> |
Accessor style for optional fields. This CL implements the 'optional_field_style=accessors' option. All optional fields will now be 1 Java field and 1 bit in a shared bitfield behind get/set/has/clear accessor methods. The setter performs null check for reference types (Strings and byte[]s). Also decentralized the clear code generation. Change-Id: I60ac78329e352e76c2f8139fba1f292383080ad3
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_accessors_nano.proto
|
47dee56155c7bdb9855e51ff08c99db306d11a2d |
18-Sep-2013 |
Max Cai <maxtroy@google.com> |
Add some bitfield helper methods from 2.4 Change-Id: Ib9bb549602f71a451d2107fb04de17877553860e
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
|
26ce449901aa8c2f954fb4a5e8bbcc1253b3ca01 |
18-Sep-2013 |
Max Cai <maxtroy@google.com> |
Add two codegen parameters to nano. enum_style = c | java: 'c' to put the enum member int constants at the parent scope; 'java' to create uninstantiatable shell classes at the parent scope and put the int constants inside. optional_field_style = default | accessors: 'default' to create one public mutable field per optional proto field; 'accessors' to encapsulate the generated fields behind get, set, has and clear accessors. This CL only contains parsing code for these two parameters. Change-Id: Iec0c3b0f30af8eb7db328e790664306bc90be089
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
|
380d1b5a78de07a081b36c890321ac61a0fced1a |
14-Aug-2013 |
Adam Metcalf <gamblore@google.com> |
Fix the merge conflict leftovers. Change-Id: I8738e69df79d7bee3fb06b57cbc9e67414a27261
uild.gradle
|
adfb09a08d450f356a69c74c0a80a3e4573e20b8 |
13-Aug-2013 |
Wink Saville <wink@google.com> |
am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit '7632e0ad04851ea5524a9f52504e7dcdbc00c514': Add a Gradle build file for the protobuf libraries.
|
7632e0ad04851ea5524a9f52504e7dcdbc00c514 |
13-Aug-2013 |
Wink Saville <wink@google.com> |
Merge commit '11c3b27d' into fix-mc * commit '11c3b27d': Add a Gradle build file for the protobuf libraries. Change-Id: Id785093c51eb423576292994a98d42efbbc3fddb
|
11c3b27da0b81064b745d4e11ba54d9ce592d318 |
13-Aug-2013 |
Wink Saville <wink@google.com> |
Merge "Add a Gradle build file for the protobuf libraries."
|
df9a6dffee90f5ff657265b415ee5eb9fb5e3960 |
09-Aug-2013 |
Wink Saville <wink@google.com> |
am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '48ee66d295979372ed0234cefda42385daae8312':
|
ba363f1380e9b99e6606462b21febd2e4027e340 |
09-Aug-2013 |
Wink Saville <wink@google.com> |
am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit 'a38aedb3fff651a4e1921162d88df3e1c75726b3':
|
48ee66d295979372ed0234cefda42385daae8312 |
09-Aug-2013 |
Wink Saville <wink@google.com> |
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e': Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
|
a38aedb3fff651a4e1921162d88df3e1c75726b3 |
09-Aug-2013 |
Wink Saville <wink@google.com> |
am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit 'e7b778b99f607460ed9ea88a13ec91164cda8537': Fix outer classname for javamicro/javanano.
|
57faa14e5c5b678b38dcae1288f3e5eb34bd819f |
08-Aug-2013 |
Adam Metcalf <gamblore@google.com> |
Add a Gradle build file for the protobuf libraries. Has two configurations: micro and nano. Change-Id: I009f956e11cf13694738743a757438ebf181b340
uild.gradle
|
4d7f9ad71771fff628e88d463af94b44457b7934 |
08-Aug-2013 |
Wink Saville <wink@google.com> |
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e': Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
|
f105476adedac50be509ed36cbb187b92fca54d9 |
08-Aug-2013 |
Wink Saville <wink@google.com> |
am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit 'e7b778b99f607460ed9ea88a13ec91164cda8537': Fix outer classname for javamicro/javanano.
|
ece98e5f6728a937c8d32d342f3b1b037a611f3e |
08-Aug-2013 |
Wink Saville <wink@google.com> |
Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
d1229a35f127eb85391797f04aed1b9fe7da9fd8 |
08-Aug-2013 |
Wink Saville <wink@google.com> |
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto. Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
ndroid.mk
|
e7b778b99f607460ed9ea88a13ec91164cda8537 |
07-Aug-2013 |
Wink Saville <wink@google.com> |
Merge "Fix outer classname for javamicro/javanano."
|
624c448fbef20a1a2fad2289f622b468c25763d1 |
29-Jul-2013 |
Max Cai <maxtroy@google.com> |
Fix outer classname for javamicro/javanano. - File class name is defined as the java_outer_classname option value or the file name ToCamelCase; never the single message's ClassName. - File-scope enums are translated to constants in the file class, regardless of java_multiple_files. - If java_multiple_files=true, and file's class name equals a message's class name, no error. This is done by detecting that the outer class is not needed and skipping the outer class codegen and clash checks. Note: there is a disparity between java[lite] and the previous java{micr|nan}o: when generating code for a single-message proto, the outer class is omitted by java{micr|nan}o if the file does not have java_outer_classname. This change makes java{micr|nan}o align with java[lite] codegen and create the outer class, but will print some info to warn of potential change of code. - Also fixed the "is_own_file" detection and made all parseX() methods static. Previously, all messages in a java_multiple_files=true file are (incorrectly) considered to be in their own files, including nested messages, causing them to become inner classes (instance- bound) and forcing the parseX() methods to lose the static modifier. - This change supersedes c/60164 and c/60086, which causes javanano to put enum values into enum shell classes if java_multiple_files=true. We now always use the parent class to host the enum values. A future change will add a command line option to provide more flexibility. - Elaborated in java/README.txt. Change-Id: I684932f90e0a028ef37c662b221def5ffa202439
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/unittest_enum_multiplejava_nano.proto
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_nano.proto
rc/google/protobuf/unittest_multiple_nano.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_single_micro.proto
rc/google/protobuf/unittest_single_nano.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
|
d55a408122072b779e4c27c6ba59c138b5613895 |
01-Aug-2013 |
Ulas Kirazci <ulas@google.com> |
am 87c8e31b: Merge "Fixed packed repeated serialization." * commit '87c8e31b8c0baa78f979863a9ed10654a1cdca1f': Fixed packed repeated serialization.
|
87c8e31b8c0baa78f979863a9ed10654a1cdca1f |
01-Aug-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Fixed packed repeated serialization."
|
14dd1f02ac95f61087e311bf61c85047fb218a29 |
29-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Fixed packed repeated serialization. Remove buggy memoization. Memoization also is too fragile for the api because the repeated field is public. Change-Id: I538b8426d274b22df2eeea5935023abbe7df49fe
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
|
ac2b5234ba6d9eec446e7cf487932f5c4d2a1137 |
29-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am be47f55e: Merge "Add an option to inspect "has" state upon parse." * commit 'be47f55e2f93df84abb55759e49cf381d2745cc5': Add an option to inspect "has" state upon parse.
|
be47f55e2f93df84abb55759e49cf381d2745cc5 |
29-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add an option to inspect "has" state upon parse."
|
35d9fd84ff1d9ecdb91156b757cc9fdcc3f25249 |
01-Apr-2013 |
Ulas Kirazci <ulas@google.com> |
Add an option to inspect "has" state upon parse. If has is set, also always serialize. Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_has_nano.proto
|
2df62a831bad2aa6eb57826c37b2b5c46c577e0d |
26-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 021f8f1b: Merge "Add test for passing in proto params." * commit '021f8f1badf1c4db519e3f35d600dec4b5c52eff': Add test for passing in proto params.
|
021f8f1badf1c4db519e3f35d600dec4b5c52eff |
26-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add test for passing in proto params."
|
669802cc412f1889c6709932745eafb6d7d0be39 |
26-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am ac5a239e: Merge "Per-file java_multiple_files flag." * commit 'ac5a239e7d90613cb9404098b70c036a52531a74': Per-file java_multiple_files flag.
|
ac5a239e7d90613cb9404098b70c036a52531a74 |
26-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Per-file java_multiple_files flag."
|
7e567b8b0a9e1155666752723ca835734d60ab92 |
24-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Add test for passing in proto params. Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
ndroid.mk
ava/README.txt
|
8170787391efcb6cc6a8babc1cce35d5b1aff420 |
24-Jul-2013 |
Max Cai <maxtroy@google.com> |
Per-file java_multiple_files flag. Imported source files may have different values for the 'java_multiple_files' option to the main source file's. Whether the fully qualified Java name of an entity should include the outer class name depends on the flag value in the file defining the referenced entity, not the main file. This CL loads the flag values from the main and all transitively imported files into the params, and generates the fully qualified Java names accordingly. If the generator option 'java_multiple_files' is set, its value overrides any in-file values in all source/imported files. This is because this generator option is typically used on either none or all source files. Change-Id: Id6a4a42426d68961dc669487d38f35530deb7d8e
ava/pom.xml
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nano.proto
|
0356bf3f22e08f4f7d9391334115f7a7766ff969 |
23-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano." * commit '3099f911382d143d9b702d36e5e52d2f37d8edd9': Allow NaN/+inf/-inf defaults in micro/nano.
|
3099f911382d143d9b702d36e5e52d2f37d8edd9 |
23-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano." * commit '19c4090eddf0eb4d65d1b41f283368c5e0f615a1': Allow NaN/+inf/-inf defaults in micro/nano.
|
19c4090eddf0eb4d65d1b41f283368c5e0f615a1 |
23-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Allow NaN/+inf/-inf defaults in micro/nano."
|
0f2ca89132ab81441f7eb351c7a053a8c8d9d1c3 |
22-Jul-2013 |
Chris Smith <cjs@google.com> |
Allow NaN/+inf/-inf defaults in micro/nano. Adds support for default values of NaN, infinity and negative infinity for floats and doubles in both the nano and micro java compiler. Change-Id: Ibc43e5ebb073e51d9a8181f3aa23b72e10015dca
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_nano.proto
|
283fc71424dc4b2aabf462cf9ff0ba35cdc37294 |
20-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am f604f71a: am a400007e: Merge "Add contribution instructions for nano." * commit 'f604f71aed9bb28f1bf06875272797b24da1dd66': Add contribution instructions for nano.
|
f604f71aed9bb28f1bf06875272797b24da1dd66 |
20-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am a400007e: Merge "Add contribution instructions for nano." * commit 'a400007ed570bbcc638c05c59727b3527238ec70': Add contribution instructions for nano.
|
a400007ed570bbcc638c05c59727b3527238ec70 |
20-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Add contribution instructions for nano."
|
3fc971c672b976c1e311e4fd9ae0b40aaf54fc37 |
19-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords properly." * commit '4c18ce2df954bc6e75b164fd008797e92beed7e1': Update nano to serialize java keywords properly.
|
231b8989fdd91147a3f097ce454a8a7a23782ac4 |
19-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Add contribution instructions for nano. Change-Id: Ie110d182a84258ab5bb3ba1f67c6ada6be476c7e
ava/README.txt
|
4c18ce2df954bc6e75b164fd008797e92beed7e1 |
19-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am aad4b307: Merge "Update nano to serialize java keywords properly." * commit 'aad4b3074456fb1acec6e64596d5c18d716ac146': Update nano to serialize java keywords properly.
|
aad4b3074456fb1acec6e64596d5c18d716ac146 |
19-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Update nano to serialize java keywords properly."
|
f4e01452f159ae6b53f5edd25fa647ca2919ae10 |
18-Jul-2013 |
Tom Chao <chaot@google.com> |
Update nano to serialize java keywords properly. Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_nano.proto
|
9db9e1e9146b6b59a9c6cfca15c9c80b537ac81e |
16-Jul-2013 |
Adam Metcalf <gamblore@google.com> |
Added micro/nano configurations to protobuf in gradle. Change-Id: I7655fafcb4ca3bd6e090d7fd549eda2eb989bfcf
uild.gradle
|
8a87cde979be8c858b290b62d27783ad239c98f4 |
11-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting." * commit '67b4303516bb01e485aa9bad9d2f372c4b2844a3': Make it possible to use MessageNano.mergeFrom without casting.
|
898da1a0236f67b9344527d6befe17a0062bf6f2 |
11-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build." * commit '7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72': Fix vanilla make build.
|
ed60c0dc59d20f788f9bcc4cf40ba5a8fe2ee616 |
11-Jul-2013 |
Wink Saville <wink@google.com> |
am 08891725: am 728a8b78: Merge "Fix the build" * commit '088917256bbdd7f28d20ed8f5abb2e723b68f4de': Fix the build
|
67b4303516bb01e485aa9bad9d2f372c4b2844a3 |
09-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting." * commit '8cf17a8fbab128bda57c573e2ef7e0fafea39269': Make it possible to use MessageNano.mergeFrom without casting.
|
8cf17a8fbab128bda57c573e2ef7e0fafea39269 |
09-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Make it possible to use MessageNano.mergeFrom without casting."
|
7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72 |
09-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
am eda87c5c: Merge "Fix vanilla make build." * commit 'eda87c5cad8cf84768bcb31d4762c6ec35a6b87d': Fix vanilla make build.
|
eda87c5cad8cf84768bcb31d4762c6ec35a6b87d |
09-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Merge "Fix vanilla make build."
|
37168637d1b1ad9aa0c11c0c254c4de9bfa16b1d |
09-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Fix vanilla make build. Nano extension sources were missing. Change-Id: Ic3278edae2db5e41e5aa2e7d58e0daa8e29f20b7
rc/Makefile.am
rc/Makefile.in
|
088917256bbdd7f28d20ed8f5abb2e723b68f4de |
09-Jul-2013 |
Wink Saville <wink@google.com> |
am 728a8b78: Merge "Fix the build" * commit '728a8b78917ded5ea0f3f9c331810aedcb5353f9': Fix the build
|
728a8b78917ded5ea0f3f9c331810aedcb5353f9 |
09-Jul-2013 |
Wink Saville <wink@google.com> |
Merge "Fix the build"
|
4ce58c2aa66ee2900f14c90cdf874cf27cc81756 |
09-Jul-2013 |
Evan Charlton <evanc@google.com> |
Fix the build javanano_extension needed to be added to the Makefile.{am,in} in addition to the Android.mk file. Change-Id: I8b917fd72d1dec13e64b3c3d13bd204c83f31402
rc/Makefile.am
rc/Makefile.in
|
19641419a381509bddfc2d0b5d60a411b67b105b |
29-Jun-2013 |
Brian Duff <bduff@google.com> |
Make it possible to use MessageNano.mergeFrom without casting. You can now do: MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes); without having to cast the message returned from mergeFrom. Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
|
a05b79d1d2ccab8862a6adbd3295a1b6d73758a9 |
26-Jun-2013 |
Wink Saville <wink@google.com> |
am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fields." * commit 'd1b8322fccad8946d3b32dda9f75048865a94209': Nano support for extensions and unknown fields.
|
d1b8322fccad8946d3b32dda9f75048865a94209 |
25-Jun-2013 |
Wink Saville <wink@google.com> |
am 0a1429cc: Merge "Nano support for extensions and unknown fields." * commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a': Nano support for extensions and unknown fields.
|
0a1429cc5ee4865550bcdddfae681a30cef58a5a |
25-Jun-2013 |
Wink Saville <wink@google.com> |
Merge "Nano support for extensions and unknown fields."
|
0e055f079f53b07de3705838a7b4742ce56839f8 |
19-Jun-2013 |
Brian Duff <bduff@google.com> |
Nano support for extensions and unknown fields. You can use the processor option store_unknown_fields to switch this support on: aprotoc --javanano_out=store_unknown_fields=true:/tmp/out A separate option for extensions isn't required. Support for unknown fields must be turned on to allow storing and retrieving extensions, because they are just stored as unknown fields. If unknown fields are switched on, extension related code will be generated when a proto message includes an extension range, or an extension is encountered. By default, store_unknown_fields is false. No additional code is generated, and the generator will error out if protos contain extension ranges or extensions. Change-Id: I1e034c9e8f3305612953f72438189a7da6ed2167
ndroid.mk
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_extension.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/unittest_extension_nano.proto
|
98bbe8a394916aa5238c1c87c1617ad3ad17a763 |
14-Jun-2013 |
Adam Metcalf <gamblore@google.com> |
Gradle project file. Adds a gradle project file so that other projects can use the :micro and :nano libraries. Change-Id: I7e5aeb584acd11d39e57bf9d4ecfc3af175ffbb2
uild.gradle
|
8ac37341ac169e99bc8e45fff614c60fee40e33a |
07-Jun-2013 |
Wink Saville <wink@google.com> |
am 9459b5c4: Merge "Fix enum field references with java_multiple_files." * commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac': Fix enum field references with java_multiple_files.
|
9459b5c45b0ad33bea9376c2afb66cf93da610ac |
07-Jun-2013 |
Wink Saville <wink@google.com> |
Merge "Fix enum field references with java_multiple_files."
|
bf79e2de36143b8b617af136c403496515373bb6 |
07-Jun-2013 |
Brian Duff <bduff@google.com> |
Fix enum field references with java_multiple_files. When the java_multiple_files option is on, enums are placed in java class files based on the name of the original enum type. This fixes field references to such enum values to point to the correct class name when setting the default. Change-Id: I51a2e251c0d0ab1e45a182ba849d314232a74bac
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/unittest_enum_multiplejava_nano.proto
|
3c46a5260aba2b42a1a4b2399168dd155d37c52f |
07-Jun-2013 |
Wink Saville <wink@google.com> |
am 6f59b383: Merge "Add toString() method to MessageNano." * commit '6f59b38386c8ff883c8e9e0a76068fa07d95bfb1': Add toString() method to MessageNano.
|
6f59b38386c8ff883c8e9e0a76068fa07d95bfb1 |
07-Jun-2013 |
Wink Saville <wink@google.com> |
Merge "Add toString() method to MessageNano."
|
8aa0ec508ffca005f22a4e06e5dbd9d9fee8c138 |
06-Jun-2013 |
Wink Saville <wink@google.com> |
am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true." * commit '4e76e72b03f6dafc9ad650864b6a12b665801b9b': Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true.
|
4e76e72b03f6dafc9ad650864b6a12b665801b9b |
06-Jun-2013 |
Wink Saville <wink@google.com> |
Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."
|
0eca14248fc14a12c5c8a6fc253bef6f58cc60c1 |
05-Jun-2013 |
Brian Duff <bduff@google.com> |
Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true. Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7 Signed-off-by: Brian Duff <bduff@google.com>
ava/pom.xml
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/unittest_enum_multiplejava_nano.proto
|
47107914acbad70ff4db1664d3664ccc994315af |
29-May-2013 |
Andrew Flynn <flynn@google.com> |
Add toString() method to MessageNano. - All of the real work for printing the proto is actually done in MessageNanoPrinter. - Uses reflection to find proto-defined fields and prints those. - Prints all fields, even defaults and nulls. - Also added a simple test to make sure it handles all proto types well. Tried not to make the test too brittle (but hey it's testing a toString() so how flexible can it be) Change-Id: I3e360ef8b0561041e010c1f3445ec45ecdcd2559
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
|
d3aac45875dbfe714f3aa13cf245d213ac8177c7 |
30-Apr-2013 |
Wink Saville <wink@google.com> |
am d29f87c7: Merge "Fix typos in protobuf readme." * commit 'd29f87c79f34ecd6b7889cc49ca9e9d90c413634': Fix typos in protobuf readme.
|
d29f87c79f34ecd6b7889cc49ca9e9d90c413634 |
30-Apr-2013 |
Wink Saville <wink@google.com> |
Merge "Fix typos in protobuf readme."
|
6a02a45d8425376695b417bf0d6c46dbab8a700c |
27-Apr-2013 |
Matt Thrailkill <mthrailkill@google.com> |
Fix typos in protobuf readme. Change-Id: Ifa3c8674482ae9575df459a3e76e9f8b4a9296b5 Signed-off-by: Matt Thrailkill <mthrailkill@google.com>
ava/README.txt
|
d8c7eb8cee21a56b8d5021a7705271d3ecf4bf2d |
09-Apr-2013 |
Ficus Kirkpatrick <ficus@android.com> |
am e0ee97ea: Merge "Don\'t use Arrays.copyOf in generated code." * commit 'e0ee97eaac9a0f3d74c42315a109cdc25f2fddc0': Don't use Arrays.copyOf in generated code.
|
e0ee97eaac9a0f3d74c42315a109cdc25f2fddc0 |
09-Apr-2013 |
Ficus Kirkpatrick <ficus@android.com> |
Merge "Don't use Arrays.copyOf in generated code."
|
710ca66fdd31db8f3920b122292bdc3250d5aada |
08-Apr-2013 |
Ficus Kirkpatrick <ficus@android.com> |
Don't use Arrays.copyOf in generated code. It didn't appear until API 9 and is thus incompatible with Froyo. Instead, allocate a new array and System.arraycopy inline. Change-Id: I2e1cd07a4a762ef8edd5ec06ceaa1d38b302823d
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
|
1a76d851d077e72f4407a630027f3cc2579f88e0 |
04-Apr-2013 |
Wink Saville <wink@google.com> |
am a6b79eb9: Merge "Prevent conflicts between local and proto variable names." * commit 'a6b79eb9618fc1774aa18a0b365e48398f23808a': Prevent conflicts between local and proto variable names.
|
5aa725374346bbfa0d5dd867d2e8450044ce13f7 |
04-Apr-2013 |
Ulas Kirazci <ulas@google.com> |
am fb8f78fe: Prevent conflicts between local and proto variable names. * commit 'fb8f78fe6e2d757b813747d5d401a0eeb0cd478b': Prevent conflicts between local and proto variable names.
|
fb8f78fe6e2d757b813747d5d401a0eeb0cd478b |
04-Apr-2013 |
Ulas Kirazci <ulas@google.com> |
Prevent conflicts between local and proto variable names. Prefix access to proto variable names with "this.". Also remove unused GenerateMergingCode. Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_nano.proto
|
a6b79eb9618fc1774aa18a0b365e48398f23808a |
04-Apr-2013 |
Wink Saville <wink@google.com> |
Merge "Prevent conflicts between local and proto variable names."
|
0f1c4eb967517e21701a3b425d115baff5d15b4f |
04-Apr-2013 |
Ulas Kirazci <ulas@google.com> |
Prevent conflicts between local and proto variable names. Prefix access to proto variable names with "this.". Also remove unused GenerateMergingCode. Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_nano.proto
|
3280d9871215c22c07aa78185317c3a3123c2152 |
03-Apr-2013 |
Ulas Kirazci <ulas@google.com> |
am 43325653: Nano protobufs. * commit '43325653beb4e5b6923d0380a84bf7e204be5c22': Nano protobufs.
|
43325653beb4e5b6923d0380a84bf7e204be5c22 |
15-Mar-2013 |
Ulas Kirazci <ulas@google.com> |
Nano protobufs. Like micro protobufs except: - No setter/getter/hazzer functions. - Has state is not available. Outputs all fields != their default. - CodedInputStream can only take byte[] (not InputStream). - Repeated fields are in arrays, not ArrayList or Vector. - Unset messages/groups are null, not "defaultInstance()". - Required fields are always serialized. To use: - Link libprotobuf-java-2.3.0-nano runtime. - Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
ndroid.mk
akefile.in
clocal.m4
onfig.h.in
onfigure
test/Makefile.in
test/aclocal.m4
test/build-aux/config.h.in
test/build-aux/ltmain.sh
test/configure
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
|
b296a1e50943209b62ab96043eca698281d98a28 |
02-Apr-2013 |
Wink Saville <wink@google.com> |
am 216c9e86: Merge "Nano protobufs." * commit '216c9e8681b9426e84c9e2222da5c0dd669261b2': Nano protobufs.
|
216c9e8681b9426e84c9e2222da5c0dd669261b2 |
02-Apr-2013 |
Wink Saville <wink@google.com> |
Merge "Nano protobufs."
|
64d8d8f89050c5ada85341f967af391f4716a7cb |
15-Mar-2013 |
Ulas Kirazci <ulas@google.com> |
Nano protobufs. Like micro protobufs except: - No setter/getter/hazzer functions. - Has state is not available. Outputs all fields != their default. - CodedInputStream can only take byte[] (not InputStream). - Repeated fields are in arrays, not ArrayList or Vector. - Unset messages/groups are null, not "defaultInstance()". - Required fields are always serialized. To use: - Link libprotobuf-java-2.3.0-nano runtime. - Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
ndroid.mk
akefile.in
clocal.m4
onfig.h.in
onfigure
test/Makefile.in
test/aclocal.m4
test/build-aux/config.h.in
test/build-aux/ltmain.sh
test/configure
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
|
adeccdc18128424a6879bc45b60be90a2e0ca104 |
15-Dec-2012 |
Ying Wang <wangying@google.com> |
am db9ab02c: (-s ours) Build against the NDK for x86 and mips too. * commit 'db9ab02c090cdc5d2b31399867a4052351b8793d': Build against the NDK for x86 and mips too.
|
db9ab02c090cdc5d2b31399867a4052351b8793d |
06-Sep-2012 |
Ying Wang <wangying@google.com> |
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
ndroid.mk
|
a939d667261041b51bfa2cc746d0f6c3b6a66207 |
06-Nov-2012 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Add gnustl+rtti version of cpp full library Adding new version of cpp library, 'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code compiled against gnustl couldn't link with this library - having both gnustl and stlport in same binary leads to nasty conflicts. Bug: 7484202 Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
ndroid.mk
|
082bf44e4b6c03be4970d461912d1d74adbb4cff |
06-Sep-2012 |
Ying Wang <wangying@google.com> |
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
ndroid.mk
|
0e637a107438c37fff84cc89a79ba9fd1bed4a26 |
14-Aug-2012 |
Ying Wang <wangying@google.com> |
am a6d94785: Retire LOCAL_NDK_VERSION. * commit 'a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3': Retire LOCAL_NDK_VERSION.
|
a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3 |
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
ndroid.mk
|
f6da580c598ac3718d65487eed1f08003ff27fd5 |
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
ndroid.mk
|
589f591841e40d6d0b6e0115a3c9f0f8055889cb |
31-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
No-op - skip bad commit Change-Id: I8cda9afd9b0c85953145135563ef4fb3a0bbb743
|
10f0f318de1a7f4a9151b9838bec62700e4c9b21 |
30-Jul-2012 |
Chad Jones <chadj@google.com> |
Initial empty repository
|
25b5a76155860b450c1176684f8e6007aab8aa7b |
27-Jun-2012 |
Andy Stadler <stadler@google.com> |
Generate "modern" java to reduce warnings * @SuppressWarnings("hiding") for field names that are reused in inner classes. * @Override for methods defined in com.google.protobuf.micro.MessageMicro * Removed unnecessary type casting * Only throw exception from writeTo when there are fields to write. This removes over 1,000 warnings from the Play client. Change-Id: I9049c94f1e6aec5e5547898defc03c8d379c3c10
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
|
77f19bf165314eb40918e43154f5047e7be8fb27 |
15-Jun-2012 |
Ying Wang <wangying@google.com> |
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
ndroid.mk
|
6b42a64f2e36e5a34b99a5c3054658ccf9735b39 |
11-Jun-2012 |
Wink Saville <wink@google.com> |
When computing Group and Message size use getSerializedSize. Bug: 6589939 Change-Id: I3050a99b08edf48301314163d41ea6f8080ffcdb
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
|
e217977611c52bccde7f7c78e1d3c790c6357431 |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
ndroid.mk
|
8a2f7578bb6289415f1d0a01c9cc96d283730480 |
21-Jun-2011 |
Wink Saville <wink@google.com> |
Fix bug in skipRawBytes if request is larger than buffer. Original solution by Scott Barta this change adds tests and also fixes the same bug that was in CodedInputStream. Change-Id: Idb49691822b3f292c5092edc52db4e153e9da49a
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
|
9fdd84ae4554a30d2a986a9b3ada9300296e4870 |
08-Feb-2011 |
Ying Wang <wangying@google.com> |
am 7cc5f59e: Unbundle protobuffer target libraries. * commit '7cc5f59ec79718040bb1efd8be2ed12af2de5e1a': Unbundle protobuffer target libraries.
|
7cc5f59ec79718040bb1efd8be2ed12af2de5e1a |
26-Jan-2011 |
Ying Wang <wangying@google.com> |
Unbundle protobuffer target libraries. Change-Id: I3047d2cd10828844562fa57ae3b619fe919c6113
ndroid.mk
|
770e6591f648204d810002aed27d0f818f9641d7 |
26-Jan-2011 |
Ying Wang <wangying@google.com> |
Unbundle protobuffer target libraries. Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
ndroid.mk
|
8d24c6add5f0a6640948afccd9976b64a04a8ed3 |
05-Nov-2010 |
Wink Saville <wink@google.com> |
Rename protoc to aprotoc. With gLucid protoc is installed in the base system, by renaming our version there will be no confusion about which compiler is being used. Change-Id: I975e29e4444af9467c9b9600d5a2e7027f4046ae
ndroid.mk
|
aeb2b2a40e2d1c2e210a2f4d29e534fd6ef29be4 |
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
ndroid.mk
|
9875374d1865894e2254adf781c54e040f75d635 |
07-Oct-2010 |
Wink Saville <wink@google.com> |
am 3574de1c: Remove vestigial references to StringUtf8Micro. Merge commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9' into gingerbread-plus-aosp * commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9': Remove vestigial references to StringUtf8Micro.
|
3574de1ca8301e1e13d1c89f2e2a902499d6bae9 |
06-Oct-2010 |
Wink Saville <wink@google.com> |
Remove vestigial references to StringUtf8Micro. Change-Id: Ica75231b03de4768c671bf046b92bd7630ecd5c8
ava/README.txt
ava/src/test/java/com/google/protobuf/MicroTest.java
|
aa645be0632f4d75ab92120bf81ead2bbd30f8f7 |
06-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
merge from gingerbread Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823
|
b854f4d90094e0e0b3b63b199fd9c26279d77245 |
05-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make these modules optional. This allows compiling this code in Gingerbread. Bug: 3064326 Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
ndroid.mk
|
373caa091181f70951688e5b34eafd3bcac96716 |
01-Oct-2010 |
Omari Stephens <xsdg@android.com> |
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
ndroid.mk
|
fdcaf07a13de696b42edbf2cf1b98e61052be8ce |
16-Aug-2010 |
Wink Saville <wink@google.com> |
Add some python generated file/dirs to external/protobuf/.gitignore. Change-Id: If22801f80a9bfe0fa5905e07894ec4b07f6db23b
gitignore
|
732aaf0089505130cea55633bcfb2fdf5111f380 |
29-Jun-2010 |
Wink Saville <wink@google.com> |
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
ndroid.mk
|
1b639e09d77de609bed080f5d2ca88d72ba42559 |
08-Jun-2010 |
Wink Saville <wink@google.com> |
Changed speed optimization for strings. Removed use of StringUtf8Micro and instead use an extra byte array instance variable directly in the class. This allows the list returned for repeated strings to be a String instead of a StringUtf8Micro making the class compatible with existing code. Removed PerfTimer.java which isn't used. Change-Id: Ie6acfb40f98f59a48c1a795d86f715078f9611f5
ava/pom.xml
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
|
a3d3079a7ea18b2c052842272949247b7b4601e9 |
05-Jun-2010 |
Wink Saville <wink@google.com> |
Add libprotobuf-java-2.3.0-lite. Also, have all the libraries follow the same naming convention so rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro. Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
ndroid.mk
|
5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00 |
04-Jun-2010 |
Kenny Root <kroot@google.com> |
Skip stlport for simulator The host's stl library conflicts with stlport, so we need to exclude stlport from inclusion in the build if we're targeting the simulator. Change-Id: Ib4da6140f4b8abb271d8e67636ccec2a796c8c5a
ndroid.mk
|
92006e8ce53aee4c55c9befde0a78e3709420583 |
04-Jun-2010 |
Wink Saville <wink@google.com> |
Merge "Add libprotobuf-cpp-2.3.0-lite"
|
b3fe74bb7067581371f487b12112b62ef8e66b9e |
04-Jun-2010 |
Wink Saville <wink@google.com> |
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
gitignore
ndroid.mk
ndroid/config.h
|
66663e974c1d66250e51f5008bce5590464bbe9a |
03-Jun-2010 |
Wink Saville <wink@google.com> |
Fix bug in generating enum class name. I was not properly constructing the enum class name if there was a period in the protobuf package name. Change-Id: I71e51d9745702fa89841ad714282afe8b42a3425
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
|
e2d542951c059563a3b7f74c257dac4f222d9dc5 |
29-May-2010 |
Wink Saville <wink@google.com> |
Add support for Java micro protobuf's to protobuf-2.3.0. See README.android for additional information. Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javamicro/javamicro_enum.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum.h
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.h
rc/google/protobuf/compiler/javamicro/javamicro_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.h
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.h
rc/google/protobuf/compiler/javamicro/javamicro_message_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_message_field.h
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
|
d0332953cda33fb4f8e24ebff9c49159b69c43d6 |
29-May-2010 |
Wink Saville <wink@google.com> |
Add protobuf 2.3.0 sources This is the contents of protobuf-2.3.0.tar.bz2 from http://code.google.com/p/protobuf/downloads/list. Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
gitignore
HANGES.txt
ONTRIBUTORS.txt
akefile.am
akefile.in
utogen.sh
onfig.h.in
onfigure
onfigure.ac
ditors/protobuf-mode.el
enerate_descriptor_proto.sh
test/CHANGES
test/CONTRIBUTORS
test/Makefile.am
test/Makefile.in
test/README
test/configure
test/configure.ac
test/include/gtest/gtest-death-test.h
test/include/gtest/gtest-spi.h
test/include/gtest/gtest-test-part.h
test/include/gtest/gtest.h
test/include/gtest/internal/gtest-death-test-internal.h
test/include/gtest/internal/gtest-internal.h
test/include/gtest/internal/gtest-param-util-generated.h
test/include/gtest/internal/gtest-param-util-generated.h.pump
test/include/gtest/internal/gtest-param-util.h
test/include/gtest/internal/gtest-port.h
test/include/gtest/internal/gtest-string.h
test/msvc/gtest-md.sln
test/msvc/gtest-md.vcproj
test/msvc/gtest.sln
test/msvc/gtest.vcproj
test/msvc/gtest_color_test_.vcproj
test/msvc/gtest_env_var_test_.vcproj
test/msvc/gtest_environment_test.vcproj
test/msvc/gtest_main-md.vcproj
test/msvc/gtest_main.vcproj
test/msvc/gtest_output_test_.vcproj
test/msvc/gtest_prod_test-md.vcproj
test/msvc/gtest_prod_test.vcproj
test/msvc/gtest_uninitialized_test_.vcproj
test/msvc/gtest_unittest-md.vcproj
test/msvc/gtest_unittest.vcproj
test/samples/sample10_unittest.cc
test/samples/sample9_unittest.cc
test/scons/SConscript
test/scons/SConstruct
test/scons/SConstruct.common
test/scripts/gen_gtest_pred_impl.py
test/src/gtest-death-test.cc
test/src/gtest-filepath.cc
test/src/gtest-internal-inl.h
test/src/gtest-port.cc
test/src/gtest-test-part.cc
test/src/gtest.cc
test/test/gtest-death-test_test.cc
test/test/gtest-filepath_test.cc
test/test/gtest-listener_test.cc
test/test/gtest-options_test.cc
test/test/gtest-port_test.cc
test/test/gtest-test-part_test.cc
test/test/gtest-typed-test_test.cc
test/test/gtest-unittest-api_test.cc
test/test/gtest_env_var_test.py
test/test/gtest_filter_unittest_.cc
test/test/gtest_repeat_test.cc
test/test/gtest_shuffle_test.py
test/test/gtest_shuffle_test_.cc
test/test/gtest_stress_test.cc
test/test/gtest_unittest.cc
test/test/gtest_xml_output_unittest.py
test/test/gtest_xml_output_unittest_.cc
test/test/gtest_xml_test_utils.py
test/xcode/Config/FrameworkTarget.xcconfig
test/xcode/Config/InternalPythonTestTarget.xcconfig
test/xcode/Config/InternalTestTarget.xcconfig
test/xcode/Config/StaticLibraryTarget.xcconfig
test/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
test/xcode/Scripts/runtests.sh
test/xcode/gtest.xcodeproj/project.pbxproj
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
4/acx_check_suncc.m4
4/stl_hash.m4
ython/google/protobuf/descriptor.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/decoder_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/encoder_test.py
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/input_stream.py
ython/google/protobuf/internal/input_stream_test.py
ython/google/protobuf/internal/message_listener.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/output_stream.py
ython/google/protobuf/internal/output_stream_test.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/wire_format.py
ython/google/protobuf/message.py
ython/google/protobuf/reflection.py
ython/google/protobuf/service.py
ython/google/protobuf/text_format.py
ython/setup.py
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/javamicro/javamicro_enum.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum.h
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.h
rc/google/protobuf/compiler/javamicro/javamicro_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.h
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.h
rc/google/protobuf/compiler/javamicro/javamicro_message_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_message_field.h
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/compiler/subprocess.h
rc/google/protobuf/compiler/test_plugin.cc
rc/google/protobuf/compiler/zip_output_unittest.sh
rc/google/protobuf/compiler/zip_writer.cc
rc/google/protobuf/compiler/zip_writer.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.h
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/structurally_valid_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
sprojects/config.h
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/test_plugin.vcproj
sprojects/tests.vcproj
|
ede38fe9b9f93888e6e41afc7abb09525f44da95 |
28-May-2010 |
Wink Saville <wink@google.com> |
Add support for Java micro protobuf's to protobuf-2.2.0a. See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
gitignore
ndroid.mk
EADME.android
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javamicro/javamicro_enum.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum.h
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.h
rc/google/protobuf/compiler/javamicro/javamicro_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.h
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.h
rc/google/protobuf/compiler/javamicro/javamicro_message_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_message_field.h
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
|
fbaaef999ba563838ebd00874ed8a1c01fbf286d |
28-May-2010 |
Wink Saville <wink@google.com> |
Add protobuf 2.2.0a sources This is the contents of protobuf-2.2.0a.tar.bz2 from http://code.google.com/p/protobuf/downloads/list and is the base code for the javamicro code generator. Change-Id: Ie9a0440a824d615086445b6636944484b3155afa
HANGES.txt
ONTRIBUTORS.txt
OPYING.txt
NSTALL.txt
akefile.am
akefile.in
EADME.txt
clocal.m4
utogen.sh
onfig.guess
onfig.h.in
onfig.sub
onfigure
onfigure.ac
epcomp
ditors/README.txt
ditors/proto.vim
ditors/protobuf-mode.el
xamples/AddPerson.java
xamples/ListPeople.java
xamples/Makefile
xamples/README.txt
xamples/add_person.cc
xamples/add_person.py
xamples/addressbook.proto
xamples/list_people.cc
xamples/list_people.py
enerate_descriptor_proto.sh
test/CHANGES
test/CONTRIBUTORS
test/COPYING
test/Makefile.am
test/Makefile.in
test/README
test/aclocal.m4
test/build-aux/config.guess
test/build-aux/config.h.in
test/build-aux/config.sub
test/build-aux/depcomp
test/build-aux/install-sh
test/build-aux/ltmain.sh
test/build-aux/missing
test/codegear/gtest.cbproj
test/codegear/gtest.groupproj
test/codegear/gtest_all.cc
test/codegear/gtest_link.cc
test/codegear/gtest_main.cbproj
test/codegear/gtest_unittest.cbproj
test/configure
test/configure.ac
test/include/gtest/gtest-death-test.h
test/include/gtest/gtest-message.h
test/include/gtest/gtest-param-test.h
test/include/gtest/gtest-param-test.h.pump
test/include/gtest/gtest-spi.h
test/include/gtest/gtest-test-part.h
test/include/gtest/gtest-typed-test.h
test/include/gtest/gtest.h
test/include/gtest/gtest_pred_impl.h
test/include/gtest/gtest_prod.h
test/include/gtest/internal/gtest-death-test-internal.h
test/include/gtest/internal/gtest-filepath.h
test/include/gtest/internal/gtest-internal.h
test/include/gtest/internal/gtest-linked_ptr.h
test/include/gtest/internal/gtest-param-util-generated.h
test/include/gtest/internal/gtest-param-util-generated.h.pump
test/include/gtest/internal/gtest-param-util.h
test/include/gtest/internal/gtest-port.h
test/include/gtest/internal/gtest-string.h
test/include/gtest/internal/gtest-tuple.h
test/include/gtest/internal/gtest-tuple.h.pump
test/include/gtest/internal/gtest-type-util.h
test/include/gtest/internal/gtest-type-util.h.pump
test/m4/acx_pthread.m4
test/m4/gtest.m4
test/make/Makefile
test/msvc/gtest.sln
test/msvc/gtest.vcproj
test/msvc/gtest_color_test_.vcproj
test/msvc/gtest_env_var_test_.vcproj
test/msvc/gtest_environment_test.vcproj
test/msvc/gtest_main.vcproj
test/msvc/gtest_output_test_.vcproj
test/msvc/gtest_prod_test.vcproj
test/msvc/gtest_uninitialized_test_.vcproj
test/msvc/gtest_unittest.vcproj
test/samples/prime_tables.h
test/samples/sample1.cc
test/samples/sample1.h
test/samples/sample1_unittest.cc
test/samples/sample2.cc
test/samples/sample2.h
test/samples/sample2_unittest.cc
test/samples/sample3-inl.h
test/samples/sample3_unittest.cc
test/samples/sample4.cc
test/samples/sample4.h
test/samples/sample4_unittest.cc
test/samples/sample5_unittest.cc
test/samples/sample6_unittest.cc
test/samples/sample7_unittest.cc
test/samples/sample8_unittest.cc
test/scons/SConscript
test/scripts/fuse_gtest_files.py
test/scripts/gen_gtest_pred_impl.py
test/scripts/gtest-config.in
test/scripts/test/Makefile
test/src/gtest-all.cc
test/src/gtest-death-test.cc
test/src/gtest-filepath.cc
test/src/gtest-internal-inl.h
test/src/gtest-port.cc
test/src/gtest-test-part.cc
test/src/gtest-typed-test.cc
test/src/gtest.cc
test/src/gtest_main.cc
test/test/gtest-death-test_test.cc
test/test/gtest-filepath_test.cc
test/test/gtest-linked_ptr_test.cc
test/test/gtest-message_test.cc
test/test/gtest-options_test.cc
test/test/gtest-param-test2_test.cc
test/test/gtest-param-test_test.cc
test/test/gtest-param-test_test.h
test/test/gtest-port_test.cc
test/test/gtest-test-part_test.cc
test/test/gtest-tuple_test.cc
test/test/gtest-typed-test2_test.cc
test/test/gtest-typed-test_test.cc
test/test/gtest-typed-test_test.h
test/test/gtest-unittest-api_test.cc
test/test/gtest_all_test.cc
test/test/gtest_break_on_failure_unittest.py
test/test/gtest_break_on_failure_unittest_.cc
test/test/gtest_color_test.py
test/test/gtest_color_test_.cc
test/test/gtest_env_var_test.py
test/test/gtest_env_var_test_.cc
test/test/gtest_environment_test.cc
test/test/gtest_filter_unittest.py
test/test/gtest_filter_unittest_.cc
test/test/gtest_help_test.py
test/test/gtest_help_test_.cc
test/test/gtest_list_tests_unittest.py
test/test/gtest_list_tests_unittest_.cc
test/test/gtest_main_unittest.cc
test/test/gtest_nc.cc
test/test/gtest_nc_test.py
test/test/gtest_no_test_unittest.cc
test/test/gtest_output_test.py
test/test/gtest_output_test_.cc
test/test/gtest_output_test_golden_lin.txt
test/test/gtest_output_test_golden_win.txt
test/test/gtest_pred_impl_unittest.cc
test/test/gtest_prod_test.cc
test/test/gtest_repeat_test.cc
test/test/gtest_sole_header_test.cc
test/test/gtest_stress_test.cc
test/test/gtest_test_utils.py
test/test/gtest_throw_on_failure_ex_test.cc
test/test/gtest_throw_on_failure_test.py
test/test/gtest_throw_on_failure_test_.cc
test/test/gtest_uninitialized_test.py
test/test/gtest_uninitialized_test_.cc
test/test/gtest_unittest.cc
test/test/gtest_xml_outfile1_test_.cc
test/test/gtest_xml_outfile2_test_.cc
test/test/gtest_xml_outfiles_test.py
test/test/gtest_xml_output_unittest.py
test/test/gtest_xml_output_unittest_.cc
test/test/gtest_xml_test_utils.py
test/test/production.cc
test/test/production.h
test/xcode/Config/DebugProject.xcconfig
test/xcode/Config/FrameworkTarget.xcconfig
test/xcode/Config/General.xcconfig
test/xcode/Config/InternalPythonTestTarget.xcconfig
test/xcode/Config/InternalTestTarget.xcconfig
test/xcode/Config/ReleaseProject.xcconfig
test/xcode/Config/TestTarget.xcconfig
test/xcode/Resources/Info.plist
test/xcode/Samples/FrameworkSample/Info.plist
test/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
test/xcode/Samples/FrameworkSample/widget.cc
test/xcode/Samples/FrameworkSample/widget.h
test/xcode/Samples/FrameworkSample/widget_test.cc
test/xcode/Scripts/runtests.sh
test/xcode/Scripts/versiongenerate.py
test/xcode/gtest.xcodeproj/project.pbxproj
nstall-sh
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
tmain.sh
4/ac_system_extensions.m4
4/acx_check_suncc.m4
4/acx_pthread.m4
4/libtool.m4
4/ltoptions.m4
4/ltsugar.m4
4/ltversion.m4
4/lt~obsolete.m4
4/stl_hash.m4
issing
rotobuf-lite.pc.in
rotobuf.pc.in
ython/README.txt
ython/ez_setup.py
ython/google/__init__.py
ython/google/protobuf/__init__.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/internal/__init__.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/decoder_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/encoder_test.py
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/input_stream.py
ython/google/protobuf/internal/input_stream_test.py
ython/google/protobuf/internal/message_listener.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/output_stream.py
ython/google/protobuf/internal/output_stream_test.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/wire_format.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/message.py
ython/google/protobuf/reflection.py
ython/google/protobuf/service.py
ython/google/protobuf/service_reflection.py
ython/google/protobuf/text_format.py
ython/mox.py
ython/setup.py
ython/stubout.py
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_generator.h
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_service.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum.h
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator.h
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_service.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/package_info.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/gzip_stream_unittest.sh
rc/google/protobuf/io/package_info.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream.h
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/package_info.h
rc/google/protobuf/reflection_ops.cc
rc/google/protobuf/reflection_ops.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.cc
rc/google/protobuf/service.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/hash.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/structurally_valid_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/substitute.cc
rc/google/protobuf/stubs/substitute.h
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testdata/golden_message
rc/google/protobuf/testdata/golden_packed_fields_message
rc/google/protobuf/testdata/text_format_unittest_data.txt
rc/google/protobuf/testdata/text_format_unittest_extensions_data.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
rc/solaris/libstdc++.la
sprojects/config.h
sprojects/convert2008to2005.sh
sprojects/extract_includes.bat
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/protoc.vcproj
sprojects/readme.txt
sprojects/tests.vcproj
|
79a4a60053f74ab71c7c3ec436d2f6caedc5be61 |
28-May-2010 |
Wink Saville <wink@google.com> |
The Android specific files prior to adding protobuf 2.2.0a sources. Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
ndroid.mk
ODULE_LICENSE_BSD_LIKE
EADME.android
|
3e6833eec60b81e825555d5a3bfc91a08c6e9df3 |
09-Mar-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Add an empty CleanSpec.mk Change-Id: I7c626546a9c52c78e0e48749a34596235ee32a84
leanSpec.mk
|
7cebc5e397263b309174af651a404aa6dccf97b3 |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 96ccdc22: reconcile main tree with open-source eclair Merge commit '96ccdc223b71f9e356d10ed3199007567996e062' * commit '96ccdc223b71f9e356d10ed3199007567996e062': android-2.1_r1 snapshot
|
96ccdc223b71f9e356d10ed3199007567996e062 |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
reconcile main tree with open-source eclair
|
9fb23fe446fc60cc135dae3154d14fdae17d37ba |
29-Jan-2010 |
The Android Open Source Project <initial-contribution@android.com> |
reconcile android-2.1_r1 snapshot
|
067706ec540472f040065cc0c6236752b31cf61d |
13-Jan-2010 |
The Android Open Source Project <initial-contribution@android.com> |
android-2.1_r1 snapshot
|
5635728f879b131d9e407c6d43a713e072b22b01 |
14-Nov-2009 |
Dan Egnor <egnor@google.com> |
The j2me protobuf code is now in vendor/google; remove it here.
rc/com/google/common/io/protocol/BoundInputStream.java
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
|
5493c80527770594637ddb7ca96725e7d2e04310 |
26-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
reconcile korg/master into goog/master
|
7e659bba0057942c441c810681f33928bcd486c9 |
26-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge korg/donut into korg/master
|
79959e70d722e8f3aaf5d420a27fd98676d586f3 |
11-Jun-2009 |
Adam Bliss <abliss@google.com> |
am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from mainline Merge commit 'a67f19deb0794784d1b841bc1900328103af03c5' * commit 'a67f19deb0794784d1b841bc1900328103af03c5': Adds a few utilities to ProtoBufUtil, integrating over from mainline
|
a67f19deb0794784d1b841bc1900328103af03c5 |
11-Jun-2009 |
Adam Bliss <abliss@google.com> |
Adds a few utilities to ProtoBufUtil, integrating over from mainline
rc/com/google/common/io/protocol/BoundInputStream.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
|
f958768159817dba6d01befa2fd70786e3c1ea26 |
11-Jun-2009 |
Mitsuru Oshima <oshima@google.com> |
am 7fea449b: Revert "ProtoBuf update" Merge commit '7fea449b53848057686ac4266ee51853bda70e30' * commit '7fea449b53848057686ac4266ee51853bda70e30': Revert "ProtoBuf update"
|
7fea449b53848057686ac4266ee51853bda70e30 |
11-Jun-2009 |
Mitsuru Oshima <oshima@google.com> |
Revert "ProtoBuf update" This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
rc/com/google/common/io/protocol/IntMap.java
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
|
e1db06285718a64bb5000c88512bb35545aa7b4d |
10-Jun-2009 |
Mitsuru Oshima <oshima@google.com> |
am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs. Merge commit '9aaf507646c866ab131bf2bcd973882ff9f553cf' * commit '9aaf507646c866ab131bf2bcd973882ff9f553cf': ProtoBuf update
|
9aaf507646c866ab131bf2bcd973882ff9f553cf |
10-Jun-2009 |
Mitsuru Oshima <oshima@google.com> |
ProtoBuf update * Added IntMap that uses Hashtable for larger keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs.
rc/com/google/common/io/protocol/IntMap.java
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
|
f1391c740d3eecf14f0e24d899f5a3760dd608b9 |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge donut into master
|
8d2478a896b5cac3365b868eb5818ce25017f423 |
29-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge branch 'open_source_no_contributions' into google_internal
|
a73ffd65100ea5d53b4295d2a810690304f21fcf |
27-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/cupcake'
|
eda64ea9d79d70333a86cefb9659adf4d144884a |
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
rc/com/google/common/io/protocol/ProtoBuf.java
|
3a3adcaf1d6c9692c1b0c53ad230e9286478ba30 |
18-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'remotes/korg/cupcake' into merge
|
e3e6e3d8aa7ac32e0f80588f6403fc18f7e476a7 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
|
1ca0f15a18c4af59a0627fa26d20c9be0b4896d4 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
|
e834f9dbe7a360a72336daeb243015e082e67dd9 |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
rc/com/google/common/io/protocol/ProtoBuf.java
|
e61379af83d28b36d9085ac181b01e4852fcd171 |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
rc/com/google/common/io/protocol/ProtoBuf.java
|
15bf10329ff5ed4b039918df3f053eaf67851e1b |
19-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132276
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
|
214e14d5efd24389ae5bd7c3debe4bb28dbd667a |
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
rc/com/google/common/io/protocol/ProtoBuf.java
|
2f1917b2d9754d6288e8de2739469bf719438388 |
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
|
35be73bfebdd5cf76922b2a44b15ebbbeaa8d079 |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
|