Wink Saville
f5392a8efe
am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
...
* commit 'b624b3aa455ecf71c44bde4cf7488e7c199a0b8a':
10 years ago
Ulas Kirazci
e24507de07
am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
...
* commit 'a6ddccbbac403dbe6fce5623768755c08d41c962':
10 years ago
Ulas Kirazci
603d3f5a73
am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
...
* commit 'a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c':
10 years ago
Ulas Kirazci
a96e4fd7b8
am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
...
* commit '6d1e97097eca8f50e629c10fcabbffbe064868b8':
10 years ago
Ulas Kirazci
f3e1090d18
am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
...
* commit '998ea484ba19563fd32ba3e2e16e785f449afa74':
10 years ago
Ulas Kirazci
9bb773f8c4
am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
...
* commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':
10 years ago
Adam Metcalf
87f4899a90
am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
...
* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':
10 years ago
Wink Saville
50b34232c9
am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
...
* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':
10 years ago
Wink Saville
6e81fbbc16
am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
...
* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':
10 years ago
Wink Saville
feac014e7d
am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
...
* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':
10 years ago
Wink Saville
b5c235ccc2
am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
...
* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':
10 years ago
Wink Saville
e8e5707aee
am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
...
* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':
10 years ago
Ying Wang
c89112387e
am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
...
* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':
10 years ago
Max Cai
4be139dcd8
am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"
...
* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c':
Fix how getRepeatedFieldArrayLength works
10 years ago
Sam Hasinoff
33824b0f1b
am f91b7fa1: Fix build, by using external/zlib instead of system zlib
...
* commit 'f91b7fa173d2aa76ce593c20e429bd8d480599ea':
Fix build, by using external/zlib instead of system zlib
10 years ago
Sam Hasinoff
333c46cd1d
Fix build, by using external/zlib instead of system zlib
...
Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51
10 years ago
Max Cai
ec0e1c00e0
Merge "Fix how getRepeatedFieldArrayLength works"
10 years ago
Leandro Gracia Gil
985cc6a74e
am 4d11e705: Merge "Fix the aprotoc target for Windows."
...
* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
Fix the aprotoc target for Windows.
10 years ago
Leandro Gracia Gil
a174231837
Merge "Fix the aprotoc target for Windows."
10 years ago
Leandro Gracia Gil
b596f9c7b4
Fix the aprotoc target for Windows.
...
Allows aprotoc.exe to be cross-compiled when building the Windows SDK.
Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
10 years ago
Brian Duff
c390fe3eb3
am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."
...
* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
Don't return NULL from {Boxed}PrimitiveTypeName.
11 years ago
Brian Duff
23c5978a76
Merge "Don't return NULL from {Boxed}PrimitiveTypeName."
11 years ago
Brian Duff
7acc0f831f
Don't return NULL from {Boxed}PrimitiveTypeName.
...
The behavior of the string ctor is undefined when you pass NULL. This
is checked strictly in C++11, so fails to compile.
Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
11 years ago
Max Cai
a481ed8269
am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."
...
* commit '11607eb10bcf3a46e92257966949d48b28bb7bf3':
Add a hasExtension method to ExtendableMessageNano.
11 years ago
Max Cai
2a5f3f97a0
Merge "Add a hasExtension method to ExtendableMessageNano."
11 years ago
Juan Silveira
c052b50388
Add a hasExtension method to ExtendableMessageNano.
...
It allows checking for the presence of an extension without having to
deserialize the field.
Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
11 years ago
Max Cai
2e91cf4f68
am a88808d4: Merge "Fix access around unknownFieldData."
...
* commit 'a88808d414308b5b567d3afaab56fc338ad80667':
Fix access around unknownFieldData.
11 years ago
Max Cai
9c2d63c8d3
am daf63839: Merge "Keep pointers to extension values."
...
* commit 'daf638399bd42122306786e8062f392ddace4363':
Keep pointers to extension values.
11 years ago
Max Cai
30b1454d8b
Merge "Keep pointers to extension values."
11 years ago
Max Cai
7a83d3482a
Merge "Fix access around unknownFieldData."
11 years ago
Max Cai
d1a8a8f6f1
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
11 years ago
Juan Silveira
79f19eb9f1
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
11 years ago
Max Cai
9ceb3d4acc
Fix how getRepeatedFieldArrayLength works
...
Change-Id: I01921eff008a8e3f7b1fbeb653d15ff8038d3220
11 years ago
Ying Wang
30cd2a4a98
am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
...
* commit '403cc9277c5540cf14b6e53a4fedf3ae5499f4cf':
You CANNOT change the global WITH_DEXPREOPT
11 years ago
Baligh Uddin
c7213e1c39
am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
...
* commit '39467629a7fb35da9fdfab4dd7603b9bfd7d9095':
11 years ago
Ying Wang
b18d5c1d43
am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
...
* commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf':
You CANNOT change the global WITH_DEXPREOPT
11 years ago
Baligh Uddin
f5759da88c
am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
...
* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':
11 years ago
Ying Wang
82461de508
You CANNOT change the global WITH_DEXPREOPT
...
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
11 years ago
Baligh Uddin
709cb7348e
keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
11 years ago
Qiwen Zhao
1d50c6b47c
reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81
11 years ago
Wink Saville
9db6d437df
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"
11 years ago
Wink Saville
3b0952fb80
Revert "Merge commit 'e887563a' into fix-merge-conclict"
...
This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.
Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
11 years ago
Wink Saville
d9b892d45b
Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
11 years ago
Wink Saville
fadc11055e
Revert "Merge commit 'e887563a' into fix-merge-conclict"
...
This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.
Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
11 years ago
Jan-Willem Maarse
9a58c6f56c
am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
...
* commit '399cf8d641c0bad4cff016f3b1a02c63fb353a21':
11 years ago
Bill Yi
ef5fd0e053
am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
...
* commit '8b5d62a4e819cb5114b294fc6754de63d50792b1':
11 years ago
Jeff Davidson
be8aadfd3b
am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
...
* commit '7b4e8c78004c479ffc99ec7c677e206cfdf8b73c':
11 years ago
Max Cai
8b6445a019
am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
...
* commit 'e69eaa2230952424fd410f3378445e78fcf58242':
11 years ago
Max Cai
8624f47bab
am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
...
* commit '888cafe432fd2da8ae1b36429b5e8f822db11ce0':
11 years ago
Wink Saville
b67c3fa484
am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
...
* commit '13fb32b15d428e4633674b9bb8bb7d4750e7e909':
11 years ago