Wink Saville
2e58634a11
am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
...
* commit 'd6be7db044050f9941ff7b7a3e57af0565d4e53c':
11 years ago
Ulas Kirazci
d8e4681030
am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
...
* commit '5f8ef51529f07ae758ec4944759828a1414dbb7c':
11 years ago
Ulas Kirazci
9865277597
am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
...
* commit 'c1f9ebcefb026a84e369347ddc23a3e4c6e9c940':
11 years ago
Ulas Kirazci
80e4a3466f
am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
...
* commit 'c017bb8c147d30641b36e6d16b9133c0dd9e8453':
11 years ago
Ulas Kirazci
1eb488bc32
am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
...
* commit '6778e0a0198f602cab76daf6428a97292007dc71':
11 years ago
Ulas Kirazci
1724ed4d4e
am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
...
* commit 'bbda8b10152bbdb7d6057724f0e3e197db9ec108':
11 years ago
Adam Metcalf
51d87cc588
am 380d1b5a: Fix the merge conflict leftovers.
...
* commit '380d1b5a78de07a081b36c890321ac61a0fced1a':
Fix the merge conflict leftovers.
11 years ago
Wink Saville
5486adb7d2
am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
...
* commit 'adfb09a08d450f356a69c74c0a80a3e4573e20b8':
11 years ago
Wink Saville
fb594ee1ec
am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
...
* commit 'df9a6dffee90f5ff657265b415ee5eb9fb5e3960':
11 years ago
Wink Saville
990a4753dc
am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
...
* commit 'ba363f1380e9b99e6606462b21febd2e4027e340':
11 years ago
Wink Saville
5534cede6e
am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
...
* commit '4d7f9ad71771fff628e88d463af94b44457b7934':
11 years ago
Wink Saville
5a2be75cb2
am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
...
* commit 'f105476adedac50be509ed36cbb187b92fca54d9':
11 years ago
Ying Wang
e251c9eb81
am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
...
* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1':
You CANNOT change the global WITH_DEXPREOPT
11 years ago
Ying Wang
efd4ae404f
am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
...
* commit '94f522f907e3f34f70d9e7816b947e62fddbb267':
You CANNOT change the global WITH_DEXPREOPT
11 years ago
Ying Wang
70ef74aaa6
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
...
* commit '49512cb01065b41c0113248c2c02800de1156d50':
You CANNOT change the global WITH_DEXPREOPT
11 years ago
Ying Wang
b54018a23c
Merge "You CANNOT change the global WITH_DEXPREOPT"
11 years ago
Ying Wang
d75027090c
You CANNOT change the global WITH_DEXPREOPT
...
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
11 years ago
Jan-Willem Maarse
42470ba6e0
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
11 years ago
Jan-Willem Maarse
00120917a1
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
11 years ago
Jan-Willem Maarse
3e46c9b5da
am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
...
* commit 'd20f0a4260763531acf5de677e4830afe0bfc53e':
Fix NPE when clearing an extension in nano protos
11 years ago
Jan-Willem Maarse
4aecb2b6d5
Merge "Fix NPE when clearing an extension in nano protos"
11 years ago
Jan-Willem Maarse
b24fdd476f
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
11 years ago
Bill Yi
05b6a7be8a
am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
...
* commit '9dde6a6d6b6f8e0a96fd3634f7e033fc30bc11e5':
11 years ago
Bill Yi
12214c58ec
am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
...
* commit 'ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce':
11 years ago
Bill Yi
af802cd274
Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEAD
11 years ago
Jeff Davidson
46bf9261af
resolved conflicts for merge of 592b6078 to master
...
Change-Id: I4c9cebcc6922a970daca2af002c96bc7e8e102b8
11 years ago
Jeff Davidson
3eafa87ab8
am 33a6680a: Merge "Support generation of Parcelable nano messages."
...
* commit '33a6680ab98977cd5b9b7b03f4875b9265cfec3b':
Support generation of Parcelable nano messages.
11 years ago
Jeff Davidson
a2724e7cf3
Merge "Support generation of Parcelable nano messages."
11 years ago
Jeff Davidson
ec4b1ce0b6
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
11 years ago
Max Cai
e278b645a2
am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
...
* commit '43365182bcd23a011476fb5e57930f1829da41fa':
Adds --ignore_service nano proto compiler flag
11 years ago
Max Cai
5cc8a31ea1
am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
...
* commit '829f6c014ce69d04593d30652c8acc2f7a793851':
Adds --ignore_service nano proto compiler flag
11 years ago
Max Cai
f1019531a6
Merge "Adds --ignore_service nano proto compiler flag"
11 years ago
Jie Dai
d9425a6218
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
11 years ago
Max Cai
a4b3e9d2b8
am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit '0391f00be135d1a52052d50171c38e9f0129031d':
Don't reset cachedSize to 0 in getSerializedSize
11 years ago
Max Cai
09f640ef43
am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit 'ea68d73c08b3b9319faef8ef9cd283e773a6ef20':
Don't reset cachedSize to 0 in getSerializedSize
11 years ago
Max Cai
56cba8eeae
Merge "Don't reset cachedSize to 0 in getSerializedSize"
11 years ago
Dave Hawkey
598087ef53
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
11 years ago
Wink Saville
68f721bfb3
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"
11 years ago
Wink Saville
6ba01e2439
am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
...
* commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860':
Revert "Don't reset cachedSize to 0 in getSerializedSize"
11 years ago
Wink Saville
1e92850c47
am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
...
* commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860':
Revert "Don't reset cachedSize to 0 in getSerializedSize"
11 years ago
Wink Saville
dc2ab87569
Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""
11 years ago
Wink Saville
b7dd7d9294
Revert "Don't reset cachedSize to 0 in getSerializedSize"
...
This reverts commit c6e12c6702ca764486f952654ba1568f00efe813.
11 years ago
Wink Saville
546ed9afaa
Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""
...
This reverts commit f213b0c6a86503ad752139f04f343578df45db07, reversing
changes made to 1a4b1d52e44104f2e10d0cdc585dde88602843d2.
11 years ago
Wink Saville
cf7ff1aa6c
am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit '5b931dc798d882754f3e7a876fc6d820fa371e95':
Don't reset cachedSize to 0 in getSerializedSize
11 years ago
Wink Saville
d76d44f529
am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797':
Don't reset cachedSize to 0 in getSerializedSize
11 years ago
Wink Saville
9d89464330
am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797':
Don't reset cachedSize to 0 in getSerializedSize
11 years ago
Wink Saville
ddc98d6dd0
Merge "Don't reset cachedSize to 0 in getSerializedSize"
11 years ago
Dave Hawkey
5090f19ea7
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
11 years ago
Wink Saville
66ec7d4151
am 51ef8f39: Merge "Fix compile error on mac 10.9"
...
* commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074':
Fix compile error on mac 10.9
11 years ago
Max Cai
e73c4a02a9
am afc1553a: Merge "Extension overhaul."
...
* commit 'afc1553a9eb56eff742828c9c819eafa363cdcc9':
Extension overhaul.
11 years ago