Max Cai
|
b331a492c8
|
am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
* commit '0eaea6a8d71e3b323f2fe3bccb3829162c04e33c':
|
10 years ago |
Jie Dai
|
4f8d54cf92
|
am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
* commit '0ce2c26133762a55c52c0262bbe393370b806276':
|
10 years ago |
Max Cai
|
9d16f8a58d
|
am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
* commit '0c063c66604c5dee434534ff775eb6d18ce4ed7b':
|
10 years ago |
Max Cai
|
f5ef0e6ba0
|
am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
* commit '06396abfe648b84e4c17d0e4a98a6cd34d57aaab':
|
10 years ago |
Max Cai
|
2b50c9f9c0
|
am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
* commit 'e41d4c041cb2c6d58c4508cf792cd4e987991b2a':
|
10 years ago |
Andrew Flynn
|
7f1f309af2
|
am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
* commit '11b030c32e2b740283ddd455e1e29748667cf314':
|
10 years ago |
Max Cai
|
b930355a1e
|
am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit '843619f3a85440e94d1cbec0f71173eb560d6d73':
|
10 years ago |
Max Cai
|
3e9233a197
|
am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
* commit '175d44dbf967c326956f5ee11cfe72cbd571601c':
|
10 years ago |
The Android Open Source Project
|
3942858d81
|
am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
* commit 'bfa5ee2ff6bde25e15bcf855f60208c01bf7fd5e':
|
10 years ago |
The Android Open Source Project
|
432b1b5e28
|
am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
* commit '6a76a968d2c5c22a313dd2646d1b2941d17ff89d':
|
10 years ago |
Max Cai
|
aad7f1d180
|
am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
* commit 'fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e':
|
10 years ago |
Max Cai
|
ed3f38f3d8
|
am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
* commit '7630b4785d2675d37a272dc274318bd5a77c3805':
|
10 years ago |
Max Cai
|
caa8cd3e0c
|
am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
* commit '4d28b813b64ccc215cd462de7f33455abbe04d0b':
|
10 years ago |
Max Cai
|
811349ad43
|
am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
* commit 'fdf5bde4157bb3e5a5dc36d4acda930fd74933f1':
|
10 years ago |
Max Cai
|
d582abfec3
|
am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit 'be303d0372ccf9e2fbc0abf238b925142ba0a8bf':
|
10 years ago |
Max Cai
|
a4193fb659
|
am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit '2693b3aadbddaa28c4f9b4f3f11236b986f15557':
|
10 years ago |
Max Cai
|
9360e76612
|
am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit 'a84e8aa6cd9b98e52d70d93ab10cbdf9c48c5a26':
|
10 years ago |
Max Cai
|
dd1856ef20
|
am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit 'c45fb6a2338edd7c900fcd3612da79ec9d0a43e5':
|
10 years ago |
Max Cai
|
5120d06359
|
am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
* commit 'b2a7fc6b0585f3c53ea8110a8740141847f3394e':
|
10 years ago |
Max Cai
|
457861614f
|
am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit 'ab8cc07120d0fbb6ea4982459bc4238f0eea61bd':
|
10 years ago |
Max Cai
|
bfe3289a11
|
am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
* commit 'aa2afb0865fa9c15dcaf657d13c5144186548320':
|
10 years ago |
Max Cai
|
5f851e79c3
|
am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit '6ed6b682a2b93135e3f5cffc7e7627b879354c82':
|
10 years ago |
Ulas Kirazci
|
e0dbffdeb6
|
am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
* commit 'f7bbfdfd53b1fbe0073eaa2b132d358edae2b545':
|
10 years ago |
Ulas Kirazci
|
357f6b779f
|
am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit 'ea95349d36ad1894fd68b23b04bc9a6422adeeb0':
|
10 years ago |
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 |
jieluo@google.com
|
e61b513b1f
|
make dist complains the file name is too long and refuse to put it to tar. Change the file to a shorter name
|
10 years ago |
jieluo@google.com
|
24095cc7e5
|
Add deleted tests back for reflection_cpp2_test.py by addtional exception catch
|
10 years ago |
jieluo@google.com
|
5dd5f0d09a
|
change python README.txt
|
10 years ago |
jieluo@google.com
|
2d10b80f45
|
change Makefile.am
|
10 years ago |
jieluo@google.com
|
b70e586603
|
put python cpp tests into pyext/
|
10 years ago |
jieluo@google.com
|
7580a8929f
|
add shared_pr.h
|
10 years ago |
jieluo@google.com
|
bde4a3254a
|
down integrate python opensource to svn
|
10 years ago |
jieluo@google.com
|
d7339318a3
|
Change java descriptor back to private
|
10 years ago |
jieluo@google.com
|
83964a9ab4
|
1, Add comments for include<algorithm> we added for min/max on VS2013. 2, Add #if/#endif to wrap #undef
|
10 years ago |
jieluo@google.com
|
7db9c098df
|
change java compiler to only produce one java file
|
10 years ago |
Max Cai
|
4be139dcd8
|
am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"
* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c':
Fix how getRepeatedFieldArrayLength works
|
10 years ago |
jieluo@google.com
|
9efebb3294
|
use #undef instead of change the name of MemoryBarrier
|
10 years ago |
jieluo@google.com
|
8d6f04ad8d
|
Cygwin doesn't work well if we try to capture stderr and stdout at the same time. Comment one test tempraly for Cygwin. Need to figure out why and add the test back for Cygwin.
|
10 years ago |