| b0575e93e4c39dec69365b850088a1eb7f82c5b3 |
|
04-Jun-2016 |
Tamas Berghammer <tberghammer@google.com> |
Update from protobuf v2.6.1 to protobuf 3.0.0-beta-3
This change just copies the upstream code into the repository without
fixing the Android.mk or fixing the possible cmpile errors. All of those
will be fixed with foloowup CLs.
Bug: b/28974522
Change-Id: I79fb3966dbef85915965692fa6ab14dc611ed9ea
/external/protobuf/src/google/protobuf/compiler/importer.cc
|
| afb4b72037e3f13db208590fc782c4bc8e27f862 |
|
20-Jan-2015 |
Jeff Davidson <jpd@google.com> |
Upgrade protobuf library to v2.6.1.
The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:
git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1
and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".
Reran ./configure && make -j12 check to regenerate configure script
and makefiles.
Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
/external/protobuf/src/google/protobuf/compiler/importer.cc
|
| a3b2a6da25a76f17c73d31def3952feb0fd2296e |
|
16-Sep-2014 |
Jeff Davidson <jpd@google.com> |
Update protobuf library from 2.3 to 2.6.
Copied in all files from the open source protobuf project at commit
edc5994525c79cd1919859a370837a6ff7c8e308, removing files which have
been renamed (COPYING.txt -> LICENSE, README.txt -> README.md).
Removed 2.3 prebuilts, which is an approach that will not work due to
incompatibility with the 2.6 runtime.
Merged in micro/nano-specific changes in the following files:
-Android.mk - updated list of C++/Java sources, bumped versions
-java/README.txt - merged in micro/nano instructions, bumped versions
-java/pom.xml - merged in micro/nano build rules, set packaging to jar
-src/Makefile.am - merged in references to micro/nano generators
-src/google/protobuf/compiler/javamicro/javamicro_file.h - imported
google/protobuf/compiler/code_generator.h and removed redundant
OutputDirectory class.
-src/google/protobuf/compiler/javanano/javanano_file.h - same
-Replaced instances of vector with std::vector as needed to get
libprotobuf-cpp-full to compile. Plan to upstream this fix per
discussion with protobuf maintainers.
Reran autogen.sh to update ./configure and associated scripts.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
/external/protobuf/src/google/protobuf/compiler/importer.cc
|
| d0332953cda33fb4f8e24ebff9c49159b69c43d6 |
|
29-May-2010 |
Wink Saville <wink@google.com> |
Add protobuf 2.3.0 sources
This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.
Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
/external/protobuf/src/google/protobuf/compiler/importer.cc
|
| fbaaef999ba563838ebd00874ed8a1c01fbf286d |
|
28-May-2010 |
Wink Saville <wink@google.com> |
Add protobuf 2.2.0a sources
This is the contents of protobuf-2.2.0a.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list and
is the base code for the javamicro code generator.
Change-Id: Ie9a0440a824d615086445b6636944484b3155afa
/external/protobuf/src/google/protobuf/compiler/importer.cc
|