| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Statically link libc++ because we copy aprotoc to unbundled projects
where libc++.so may not be available.
Change-Id: I1f1abc015696c1ccd8600338c147d51aca2253a1
|
|
|
|
|
|
|
|
|
| |
Cherry-pick of:
https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053
Bug: 21303860
Signed-off-by: Jeff Davidson <jpd@google.com>
Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
|
|
|
|
| |
Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
|
|\
| |
| |
| |
| | |
* commit '4a9673333abfffe0b3603d412e1f3bc134b443ac':
DO NOT MERGE
|
| |\
| | |
| | |
| | |
| | | |
* commit '2a22b4d85d0026e8ffc8768b4822bc36120fc6d4':
DO NOT MERGE
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a hasExtension method to ExtendableMessageNano.
It allows checking for the presence of an extension without having to
deserialize the field.
This a cherry-pick of 0f67b212cd169ccf83221273ed88504d7e3f8165 from master.
Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
instead of IllegalArgumentException."
* commit 'a07081b82c9a7b3da4a4a0cb577748c66bf2bf9e':
Throw OutOfSpaceException instead of IllegalArgumentException.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
IllegalArgumentException."
* commit '63b42c8d7eb6b60fed296273513fc88b34b93469':
Throw OutOfSpaceException instead of IllegalArgumentException.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
IllegalArgumentException."
* commit '92f1bf25e822eb156a57b7ede390efb89e283a87':
Throw OutOfSpaceException instead of IllegalArgumentException.
|
| | | |\ \ |
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When a MessageNano containing a String is serialized into a buffer that
is too small to contain it, and the buffer's boundary happens to be
where the string field's length delimiting varint is serialized,
and the string's length and 3*length have the same length when
encoded as a varint, an IllegalArgumentException is thrown rather than
an OutOfSpaceException.
Github issue: https://github.com/google/protobuf/issues/292
Change-Id: If478d68cf15bfd0662252d008e42b2bf1ff1c75e
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It turns out dex (apparently) was inlining these protected final
methods from ExtendableMessageNano into every message class. Removing
these methods from the base class and inlining their code reduces
the method count by 2 methods / message when the store_unknown_fields
option is on.
Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Parcelable message."
* commit 'eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482':
Generate a CREATOR for each Parcelable message.
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
message."
* commit '1d4b8b9fc9950152a1b235dfc83cf613a3b18ca4':
Generate a CREATOR for each Parcelable message.
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | | |
* commit 'ff882b4094995bc7dd9b183951cf84aa04527361':
Generate a CREATOR for each Parcelable message.
|
| | | |\ \ |
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is less ideal from a dex count perspective because it requires a
new variable for each message, and because most apps have proguard
rules that will ensure that CREATOR classes are retained.
However, it is required to be able to use nano protos inside of AIDL
files, as the autogenerated AIDL code fails to compile otherwise. This
is a substantial benefit as it allows for backwards-compatible
parameters and return types in AIDL methods along the lines of
safeparcel.
Bug: 19084705
Change-Id: I66a2c0424b96cf8ff6b631b186cc4f9407dfc1f4
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | | |
* commit 'aba240b005645cc557b21cff484928c3024b0fc3':
|
| |\ \ \ \
| | |/ / /
| |/| | | |
|
|\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | | |
* commit '25f140b3e3d38af172ba484561a5da1667325629':
Inline unknownFieldData{Equals,HashCode} to generated code.
Expose generate_clear as an option.
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'a20fd65468ba6975aa65f1fe565d3dfd23207621':
Make the tag field public.
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088':
Add MessageNano.messageNanoEquals().
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'bb80065a75206799123bde22fdd533dfe3392e52':
Fixed octal printing of bytearrays
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* commit 'd85ee8b8cda8cba35a28952f0de9186abc3422c5':
Revert "Fixed octal printing of bytearrays"
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* commit 'a78c78688b1e79afc7cb67316ff7d104829d84fd':
Fixed octal printing of bytearrays
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
access around unknownFieldData."
* commit 'bfe5b30ef488bbbfb3a52775d796d3b9e08e12c5':
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
pointers to extension values."
* commit '1b3c7f48c93900ac850269004cfc96489f487861':
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
8eed3705: You CANNOT change the global WITH_DEXPREOPT
* commit 'cb095d21de77c2f261dddf6402764f7868082615':
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
* commit 'ca524e2f9e94099d2399d6487a4d9b6fe02509ed':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
"Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
* commit '62a0f9d481ce6c5525dd93007afbdf092e011237':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
\'e887563a\' into fix-merge-conclict"
* commit 'f95440f837799b2ffa6aea68dbdb3251550a9b79':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
* commit '4344e415b9ed3da78da50853e288aaec5cc515cb':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
* commit '549268de5c242ab7948b53bc5f8e8a83d33b72fe':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
8113c186: resolved conflicts for merge of 592b6078 to master
* commit '6d2d0f4023043221456fd263e33648b1ab6bc502':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | |
99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
* commit '563f32c433628a38440b1d799f52c1d4f889aaf3':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | |
dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit '0d0b326431b54d4b59a3405a7c5c63f8ed4d3a8b':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
* commit '985244abea85772c5fa4cae5012af903ca59a30a':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
\'f65ee555\' into fix-merge-conflict
* commit '70f9fdd38c40a4cb1aaeeb34f45f087d23bdf549':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit '75244665e3b7d228b0887d0ff43a84a30c358f62':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |
1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
* commit '8345e3e6d8965a5cc2aa7a3067f3e2b1e7b032f0':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
* commit '5cba1b7dcad5909a72e940bc15a1480327d104fb':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
* commit 'fc9b38a1992610a6a0e3b51dad39901df293a980':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
* commit '4cce7ca7d4cf026a62a1fd5b37b7e028040866da':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
* commit 'dc08aae549f3a38bc6b1cc5a1facbbcadf4969f4':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
* commit '99f1c88ba4039deed33328dea1e9dc38e8ca0134':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
* commit '2b0e6788f9eab2271b28591383ed7db2309e69d4':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
* commit '18072b1d0063576040575f8970d36f11a8527fbc':
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit '31111e302e14330c3868e6b1456dbe1e0293edef':
|