aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build host libraries for Windowsnougat-devAdam Lesinski2016-04-061-0/+4
| | | | Change-Id: I4f2eadf97a7d78cebfc0001a38f3c80750eac5fc
* Add static c++ host target for host side toolsAdam Lesinski2016-03-101-2/+14
| | | | Change-Id: I8ce3190f61e7871c4bbf6d4ddaee6ea2bd8e583b
* Parse unknown enum values like full proto2.Jeff Davidson2016-03-084-14/+197
|\ | | | | | | | | | | | | am: ae409fcc56 * commit 'ae409fcc56e34811fbfe394d86108ea8cca908e9': Parse unknown enum values like full proto2.
| * Parse unknown enum values like full proto2.Jeff Davidson2016-03-084-14/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store unknown values in the unknown field set. For repeated fields, store unknown values while leaving known values in place. This can lead to some strange behaviors, such as new values not being serialized (because the unknown field set copy comes second on the wire), or the order of repeated fields changing (if the value is serialized when the field is unknown, and deserialized later when it becomes known). Having strange behavior be consistent with the standard implementation is nonetheless better than diverging. Bug: 26337187 Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
* | Force protobuf to continue to use v51 (1.7) .class filesNeil Fuller2016-02-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | The default is changing to v52 (1.8). The build for this package uses jarjar to repackage .class files. The version of jarjar in the Android tree does not currently support v52 .class files. Bug: 26753820 Change-Id: I74fc1b24e38e745e79a5c89030c341a0c71ff8ae
* | resolve merge conflicts of 68879d8c1c to mnc-dr2-dev-plus-aosp.Marie Janssen2016-02-051-0/+41
|\ \ | | | | | | | | | | | | | | | | | | am: e4127259dd * commit 'e4127259dd2ab675d6af062ef338f978c835cf60': Build libprotobuf-cpp-full for the host
| * \ resolve merge conflicts of 68879d8c1c to mnc-dr2-dev-plus-aosp.Marie Janssen2016-02-041-0/+41
| |\ \ | | | | | | | | | | | | Change-Id: I79663e376d9d5c9624e6ed0722c6c701a07cc784
| | * \ Merge "Build libprotobuf-cpp-full for the host"brillo-m10-releasebrillo-m10-devMarie Janssen2016-02-051-0/+41
| | |\ \
| | | * | Build libprotobuf-cpp-full for the hostMarie Janssen2016-02-041-0/+41
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch builds libprotobuf-cpp-full with and without rtti for the host, using the same module names. Enabling these allows us to have tests that duplicate each other on the target and host machines which both use the full protobuf library. Bug: 25691403 Change-Id: I373aa0c9bb126072d9c4dedb79380e896857b013
* | | | Merge "Remove headers from LOCAL_SRC_FILES" am: 5a5fd5d133Dan Willemsen2016-01-261-31/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: c19c30dd96 * commit 'c19c30dd968dae654255cad8c70f083b06d28358': Remove headers from LOCAL_SRC_FILES
| * | | Merge "Remove headers from LOCAL_SRC_FILES"Dan Willemsen2016-01-261-31/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 5a5fd5d133 * commit '5a5fd5d133377f4fe2c2df50e999f0cf9cd2add4': Remove headers from LOCAL_SRC_FILES
| | * | Merge "Remove headers from LOCAL_SRC_FILES"Dan Willemsen2016-01-261-31/+0
| | |\ \
| | | * | Remove headers from LOCAL_SRC_FILESDan Willemsen2016-01-251-31/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system does not use headers in LOCAL_SRC_FILES. To prevent typos, it's becoming a warning to add something to LOCAL_SRC_FILES that is not used. Also removes commented out copies of LOCAL_COPY_HEADERS. LOCAL_EXPORT_C_INCLUDE_DIRS should be (and is) used instead. Change-Id: Ie59e2857abb0360481902e2b080b15fb75331aa9
* | | | Merge "Build libprotobuf-cpp-lite for the host." am: af9545b7f8Alex Deymo2015-12-091-0/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 60afb8a183 * commit '60afb8a18392ae9d891e20a1f4276c89b9781ed8': Build libprotobuf-cpp-lite for the host.
| * | | Merge "Build libprotobuf-cpp-lite for the host."Alex Deymo2015-12-101-0/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: af9545b7f8 * commit 'af9545b7f83e470eab55b6773dc71d847ddab9c6': Build libprotobuf-cpp-lite for the host.
| | * | Merge "Build libprotobuf-cpp-lite for the host."brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devAlex Deymo2015-12-101-0/+42
| | |\ \
| | | * | Build libprotobuf-cpp-lite for the host.Alex Deymo2015-12-091-0/+42
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch builds libprotobuf-cpp-lite with and without rtti for the host, using the same module names than when building for the target. These libraries are automatically included by the build system when generating C++ headers from a .proto file, so having the same name makes that work for the host binaries as well. Bug: 24619596 TEST=mma on linux and mac Change-Id: I3af27bbbea3ab5ca1a418add3da1d03c4e1a63e5
* | | | Merge "Basic code insertion points for javanano protocompiler plugins." am: ↵Brian Duff2015-12-082-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dea517e990 am: 9259a3011e * commit '9259a3011e48fe78ce84416d45125a39725a65d8': Basic code insertion points for javanano protocompiler plugins.
| * | | Merge "Basic code insertion points for javanano protocompiler plugins."Brian Duff2015-12-082-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: dea517e990 * commit 'dea517e990189ca652c980dc89ab4ff645a96bdd': Basic code insertion points for javanano protocompiler plugins.
| | * | Merge "Basic code insertion points for javanano protocompiler plugins."Brian Duff2015-12-082-0/+6
| | |\ \
| | | * | Basic code insertion points for javanano protocompiler plugins.Joe Covalesky2015-12-072-0/+6
| | |/ / | | | | | | | | | | | | Change-Id: I519e3882682638890150601270b74c38e5e8cb0e
* | | | Add libprotobuf-cpp-full-rtti target for the platform. am: 96c04e407fGarret Kelly2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 0b5d823b42 * commit '0b5d823b42ab07f55bd163910f9642bed75e17bd':
| * | | Add libprotobuf-cpp-full-rtti target for the platform.Garret Kelly2015-11-191-0/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 96c04e407f * commit '96c04e407fff5e49a4fb83d1c6c632e4db9d0827': Add libprotobuf-cpp-full-rtti target for the platform.
* | | | | Add libprotobuf-cpp-lite-rtti target for the platform. am: 8f8019ca63Alex Deymo2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3584609610 * commit '358460961042c808943aae8b5b9ac377b5a694dd':
| * | | | Add libprotobuf-cpp-lite-rtti target for the platform.Alex Deymo2015-11-190-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8f8019ca63 * commit '8f8019ca631aae82500c0b66064d6b785df01f09': Add libprotobuf-cpp-lite-rtti target for the platform.
* | | | | | Silence -Wsign-compare warning on protobuf-lite headers. am: a17c883010Alex Deymo2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3a3cdd57ba * commit '3a3cdd57ba8bdc0712a187f7c3c41a3014f5ca10':
| * | | | | Silence -Wsign-compare warning on protobuf-lite headers.Alex Deymo2015-11-190-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a17c883010 * commit 'a17c883010fcd65ede6ce6f01c4ca022769ae8ba': Silence -Wsign-compare warning on protobuf-lite headers.
* | | | | | | Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs. am: 6483431c73 ↵Daniel Erat2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: ba5daf6f22 * commit 'ba5daf6f227f5f439fa81d1d98b74ad6b1cfcafc':
| * | | | | | Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.Daniel Erat2015-11-190-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6483431c73 -s ours * commit '6483431c73734412ed49d4ee280ec003f512f3ca': Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
* | | | | | | | package version metadata for external/ am: b921c150c0Damien Miller2015-11-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d242d01fc8 * commit 'd242d01fc8003ae53aaeee4763ac48582265095a':
| * | | | | | | package version metadata for external/Damien Miller2015-11-191-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b921c150c0 * commit 'b921c150c086589251ce4472832918c90d8585e0': package version metadata for external/
* | | | | | | | Add libprotobuf-cpp-full-rtti target for the platform.Garret Kelly2015-11-170-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 96c04e407f * commit '96c04e407fff5e49a4fb83d1c6c632e4db9d0827': Add libprotobuf-cpp-full-rtti target for the platform.
| * | | | | | | Add libprotobuf-cpp-full-rtti target for the platform.Garret Kelly2015-11-161-0/+21
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Programs which don't use the lite runtime and do use -frtti require a full protobuf target with the same flags. Bug: none Change-Id: If75ad33fa948933308768072602c0bb35e4eaac1 (cherry picked from commit 081728da938dbbc24ee029226e061c01b2304f18)
* | | | | | | Add libprotobuf-cpp-lite-rtti target for the platform.Alex Deymo2015-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8f8019ca63 * commit '8f8019ca631aae82500c0b66064d6b785df01f09': Add libprotobuf-cpp-lite-rtti target for the platform.
| * | | | | | Add libprotobuf-cpp-lite-rtti target for the platform.Alex Deymo2015-11-161-0/+22
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When linking against libprotobuf-lite, if your program is compiled with -frtti, you need the typeinfo for google::protobuf::MessageLite. On the other hand, if your program is compiled with -fno-rtti, you need libprotobuf-lite to be compiled with -DGOOGLE_PROTOBUF_NO_RTTI so the library headers don't attempt to use the type information. To allow old programs compiled with -fno-rtti and new programs compiled with -frtti coexists, this patch introduces a new target libprotobuf-cpp-lite-rtti enabling -frtti on libprotobuf-cpp-lite similar to the existing libprotobuf-cpp-full-gnustl-rtti. Bug: 23084776 Change-Id: I28d435485b9cb2509dfecb0d0e70f0db150687d2 Test: `mma external/protobuf` (cherry picked from commit a4e6f5be2813d8369dbaabe8eda497f5ed72a570)
* | | | | | Silence -Wsign-compare warning on protobuf-lite headers.Alex Deymo2015-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a17c883010 * commit 'a17c883010fcd65ede6ce6f01c4ca022769ae8ba': Silence -Wsign-compare warning on protobuf-lite headers.
| * | | | | Silence -Wsign-compare warning on protobuf-lite headers.Alex Deymo2015-11-161-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is cherry-pick from upstream: https://github.com/google/protobuf/commit/717f80749996ba97d050dd980a8e2ed97873d49e Bug: 23084776 Change-Id: I2f52aa27eba9f7162338b3d453f47af5d80cf43a (cherry picked from commit a0d463f6b8c341943da438944b591ee16348815f)
* | | | | Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.Daniel Erat2015-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6483431c73 -s ours * commit '6483431c73734412ed49d4ee280ec003f512f3ca': Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
| * | | | Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.Daniel Erat2015-11-161-0/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Export the src/ directory so other packages don't need to manually add it as an include path. Change-Id: I6ffccd66997b9da8e735e7e6ae49125ada830994 (cherry picked from commit 51cac91153363bcba2a90e4a8f219c49d5c3103f)
* | | | package version metadata for external/Damien Miller2015-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: b921c150c0 * commit 'b921c150c086589251ce4472832918c90d8585e0': package version metadata for external/
| * | | package version metadata for external/Damien Miller2015-11-161-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | This will be used for automated notification of external vulnerability reports. Change-Id: I5f74fcb25dcee166c4328660900cad0a45411659 (cherry picked from commit 1e91ed3b0824b7211559dec2122e0a4d439679c0)
* | | Merge "Add libprotobuf-cpp-full-rtti target for the platform."Garret Kelly2015-11-051-0/+21
|\ \ \
| * | | Add libprotobuf-cpp-full-rtti target for the platform.Garret Kelly2015-11-051-0/+21
| | |/ | |/| | | | | | | | | | | | | | | | | | | Programs which don't use the lite runtime and do use -frtti require a full protobuf target with the same flags. Bug: none Change-Id: Ifc8f0d2a38d8e01dacbde2d28c72a328abb1a321
* | | Merge "Minor cleanup in CodedInputByteBufferNano." am: f0b8850a8eBrian Duff2015-10-221-20/+21
|\| | | | | | | | | | | | | | | | | | | | am: 57a781dbec * commit '57a781dbecdca5ee544c0d20b921288be46e0fb3': Minor cleanup in CodedInputByteBufferNano.
| * | Merge "Minor cleanup in CodedInputByteBufferNano."Brian Duff2015-10-221-20/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: f0b8850a8e * commit 'f0b8850a8e63b6811f9470dad5704c613724377f': Minor cleanup in CodedInputByteBufferNano.
| | * \ Merge "Minor cleanup in CodedInputByteBufferNano."studio-1.2-releasebrillo-m7-releasebrillo-m7-mr-devbrillo-m7-devBrian Duff2015-10-221-20/+21
| | |\ \
| | | * | Minor cleanup in CodedInputByteBufferNano.Nathan Mittler2015-10-221-20/+21
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is some cruft in the CodedInputByteBufferNano related to fast/slow path for reading bytes that is not applicable for nano, due to the fact that all of the data is buffered into a final byte array. Cleaning up the code a bit to make it more explicit that truncation will result if the data is not buffered. Change-Id: I94c44e970790df0b9b6b598b8dfe1d510dd40bc0
* | | | am 77e300be: am c0bdb541: am ecc40a3a: Merge "Fix name for NDK protobuf ↵Dan Albert2015-09-091-31/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | libraries." * commit '77e300be5c54767980e166fc7febbfc9f270d43f': Fix name for NDK protobuf libraries.
| * | | am c0bdb541: am ecc40a3a: Merge "Fix name for NDK protobuf libraries."Dan Albert2015-09-091-31/+10
| |\| | | | | | | | | | | | | | | | | | * commit 'c0bdb5415e78dfb6a07257fd7538960d6bef7cca': Fix name for NDK protobuf libraries.
| | * | am ecc40a3a: Merge "Fix name for NDK protobuf libraries."Dan Albert2015-09-091-31/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'ecc40a3a1dc0bb6b5a0cd0750f90bc7a7fefab43': Fix name for NDK protobuf libraries.
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-07 07:42:09 +0000