aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"Ying Wang2014-05-021-1/+1
|\ | | | | | | | | * commit '49512cb01065b41c0113248c2c02800de1156d50': You CANNOT change the global WITH_DEXPREOPT
| * Merge "You CANNOT change the global WITH_DEXPREOPT"Ying Wang2014-05-021-1/+1
| |\
| | * You CANNOT change the global WITH_DEXPREOPTYing Wang2014-05-011-1/+1
| | | | | | | | | | | | | | | Bug: 14380196 Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
* | | am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"Jan-Willem Maarse2014-05-012-1/+15
|\ \ \ | |/ / | | | | | | | | | * commit 'd20f0a4260763531acf5de677e4830afe0bfc53e': Fix NPE when clearing an extension in nano protos
| * | Merge "Fix NPE when clearing an extension in nano protos"Jan-Willem Maarse2014-05-012-1/+15
| |\ \ | | |/ | |/|
| | * Fix NPE when clearing an extension in nano protosJan-Willem Maarse2014-05-012-1/+15
| |/ | | | | | | | | | | | | 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
* | Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEADBill Yi2014-04-290-0/+0
|\ \ | |/ |/|
| * am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""Wink Saville2014-03-225-41/+10
| |\ | | | | | | | | | | | | * commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860': Revert "Don't reset cachedSize to 0 in getSerializedSize"
| * \ am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-215-10/+41
| |\ \ | | | | | | | | | | | | | | | | * commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797': Don't reset cachedSize to 0 in getSerializedSize
| * \ \ am 51ef8f39: Merge "Fix compile error on mac 10.9"Wink Saville2014-03-081-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074': Fix compile error on mac 10.9
| * \ \ \ am afc1553a: Merge "Extension overhaul."Max Cai2014-03-0716-538/+1142
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afc1553a9eb56eff742828c9c819eafa363cdcc9': Extension overhaul.
| * \ \ \ \ am 447f664a: Merge changes I9fecff3c,I2c1eb07fMax Cai2014-03-078-61/+315
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '447f664aef6694bb9fb3db85d6166d908cde8a8d': Fix repeated packed field merging code for non-packed data. Add validation when parsing enum fields.
| * \ \ \ \ \ am a8af729b: Merge "Allow whitespace in nano codegen options."Max Cai2014-01-144-31/+51
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8af729b5ef822971f025a7e8ff197545986910d': Allow whitespace in nano codegen options.
| * \ \ \ \ \ \ am 4b5874fa: Merge "Correctness: floating point equality using bits instead ↵Max Cai2014-01-134-50/+183
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of ==." * commit '4b5874fad099faefb469c632e4c7b854cea733ae': Correctness: floating point equality using bits instead of ==.
| * \ \ \ \ \ \ \ am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are ↵Max Cai2014-01-134-6/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unset." * commit 'd6aeae143cde31b79a2d57a3ee0e41d9083d232d': Don't serialize required fields whose 'has' flags are unset.
| * \ \ \ \ \ \ \ \ am e7741c06: Merge "Fix MessageNanoPrinter for accessors"Andrew Flynn2013-12-193-25/+102
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e7741c064ee4cdc5fa41e6444ed45131672fed97': Fix MessageNanoPrinter for accessors
| * \ \ \ \ \ \ \ \ \ am 3f9bd998: Merge "Avoid class initializers to help ProGuard."Max Cai2013-12-1012-94/+248
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f9bd9989c79db575b83e2f96b48c695f30ca153': Avoid class initializers to help ProGuard.
| * \ \ \ \ \ \ \ \ \ \ am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"Max Cai2013-12-105-138/+53
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cea499acf68b35921b956785c26c0e6f18c241c1': Nano: don't generate accessor methods for nested methods
| * \ \ \ \ \ \ \ \ \ \ \ am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6089cca5248f19832dde54faaad62891ff8bd25':
| * \ \ \ \ \ \ \ \ \ \ \ \ am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4c4a562672068fb89ea4e65408dd53de2ed8f1f':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am f5271c9c: Merge "Align with main: two ways of parsing repeated packable ↵Max Cai2013-11-2111-106/+326
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fields." * commit 'f5271c9ca4a237221c0ba722dc548050ad131064': Align with main: two ways of parsing repeated packable fields.
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Support generation of Parcelable nano messages."Jeff Davidson2014-04-2511-6/+454
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Support generation of Parcelable nano messages.Jeff Davidson2014-04-2511-6/+454
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Merge "Adds --ignore_service nano proto compiler flag"Max Cai2014-04-244-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Adds --ignore_service nano proto compiler flagJie Dai2014-04-234-2/+21
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Merge "Don't reset cachedSize to 0 in getSerializedSize"Max Cai2014-04-145-9/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-04-105-9/+37
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""Wink Saville2014-03-225-41/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "Don't reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-215-41/+10
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6e12c6702ca764486f952654ba1568f00efe813.
* | | | | | | | | | | | | | Merge "Don't reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-215-10/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-03-215-10/+41
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "Fix compile error on mac 10.9"Wink Saville2014-02-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix compile error on mac 10.9Wink Saville2014-02-211-0/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Extension overhaul."Max Cai2014-02-1716-538/+1142
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Extension overhaul.Max Cai2014-01-1016-538/+1142
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | | | | Merge changes I9fecff3c,I2c1eb07fMax Cai2014-02-108-61/+315
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix repeated packed field merging code for non-packed data. Add validation when parsing enum fields.
| * | | | | | | | | | Fix repeated packed field merging code for non-packed data.Max Cai2014-01-162-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enum fix is already included in the previous commit. Bug: https://code.google.com/p/android/issues/detail?id=64893 Change-Id: I9fecff3c8822918a019028eb57fa39b361a2c960
| * | | | | | | | | | Add validation when parsing enum fields.Max Cai2014-01-167-52/+299
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Allow whitespace in nano codegen options."Max Cai2014-01-144-31/+51
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Allow whitespace in nano codegen options.Max Cai2014-01-144-31/+51
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we don't need to keep all option in a single line in the .mk files. Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
* | | | | | | | | Merge "Correctness: floating point equality using bits instead of ==."Max Cai2014-01-134-50/+183
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Correctness: floating point equality using bits instead of ==.Max Cai2014-01-104-50/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Don't serialize required fields whose 'has' flags are unset."Max Cai2014-01-134-6/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Don't serialize required fields whose 'has' flags are unset.Max Cai2014-01-104-6/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbe944fff83e44a8f2206e18ee9ec6f10661297a
* | | | | | | Merge "Fix MessageNanoPrinter for accessors"Andrew Flynn2013-12-193-25/+102
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix MessageNanoPrinter for accessorsAndrew Flynn2013-12-123-25/+102
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Avoid class initializers to help ProGuard."Max Cai2013-12-1012-94/+248
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Avoid class initializers to help ProGuard.Max Cai2013-12-1012-94/+248
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Nano: don't generate accessor methods for nested methods"Max Cai2013-12-105-138/+53
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Nano: don't generate accessor methods for nested methodsAndrew Flynn2013-12-095-138/+53
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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