| 69463b21c8dcc156bcdaf18191d0d8076c5ac93d |
|
12-Mar-2015 |
P.Y. Laligand <pylaligand@google.com> |
Added a build rule for the full version of the protocol buffer library.
Only added a host-side version as the full version is unlikely to be used on the device side.
b/19415609
Change-Id: Ibdd1ad589c2becff735a8cc72b7a7e5d89e45d3e
/external/protobuf/Android.mk
|
| 30d873bd66f50a6021de5d44d7ee5b8a809b0524 |
|
11-Feb-2015 |
Jeff Davidson <jpd@google.com> |
Generate @IntDef annotations for nanoproto enums.
@IntDef is a support library annotation which allows build tools to
determine the valid set of values for a given integer field when that
field is intended to be restricted like an enum. This avoids the
overhead of enums while still allowing for compile-time type checking
in most circumstances.
Change-Id: Iee02e0b49a8e069f6456572f538e0a0d301fdfd5
/external/protobuf/Android.mk
|
| 58e00bc69fc2e309384b09ec6088e65f3d322cd6 |
|
07-Feb-2015 |
Jeff Davidson <jpd@google.com> |
Use libstdc++, not libc++_static, with protobuf.
libc++_static causes problems with some windows builds. libstdc++
reverts back to the old behavior of using the system's libstdc++ (or
libc++ on darwin).
Bug: 19285118
Change-Id: Ib4fca25da24746e55b620db63f2f810ba3794f3d
/external/protobuf/Android.mk
|
| 7b93f287c2bce7520f2a80d7c059415d31221f2a |
|
06-Feb-2015 |
Jeff Davidson <jpd@google.com> |
Include libc++ statically in aprotoc.
Allows us to include aprotoc as a prebuilt separate from the platform
build for use in unbundled projects.
Bug: 19285118
Change-Id: I05f5dbf019ab08db31c33e7d30899189175a8315
/external/protobuf/Android.mk
|
| 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/Android.mk
|
| 0c44a2d48095860ad077ab6ef82468900eb1171d |
|
11-Nov-2014 |
Dan Albert <danalbert@google.com> |
Add platform versions of the protobuf libraries.
NDK libraries should not be linked in to platform code, so create a
separate version for the platform that is linked against libc++
instead of the NDK STLs.
Bug: 15193147
Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855
/external/protobuf/Android.mk
|
| 18007b8462bc2f361ac9fbf89e434dd5d4e3649a |
|
16-Oct-2014 |
Jeff Davidson <jpd@google.com> |
Move protobuf 2.3.0 to prebuilts.
This will facilitate an upgrade to 2.6.0 and future versions without
breaking applications which have a hardcoded dependency on 2.3.0. The
existing make rules have been renamed to omit the version code.
The prebuilts were built from a tree at commit
9be7e7401174d75e87e21fdc5f43549594a714bb.
Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
/external/protobuf/Android.mk
|
| bcbea78e367523e5cbb257c25c03a31b1250c7ba |
|
29-Jul-2014 |
Leandro Gracia Gil <leandrogracia@google.com> |
Fix the aprotoc target for Windows.
Allows aprotoc.exe to be cross-compiled when building the Windows SDK.
Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
/external/protobuf/Android.mk
|
| eaa37c503adff80aa6a99d1503bd0d0343a93a23 |
|
02-May-2014 |
Ying Wang <wangying@google.com> |
You CANNOT change the global WITH_DEXPREOPT
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
/external/protobuf/Android.mk
|
| 721ea491a8e3e9ea5a130965dc5761fc335c3e61 |
|
23-Apr-2014 |
Jeff Davidson <jpd@google.com> |
Support generation of Parcelable nano messages.
This CL adds the "parcelable_messages" option. When enabled, all
generated message classes will conform to the Android Parcelable
contract. This is achieved by introducing a new parent class for
generated classes which implements the required functionality.
Since the store_unknown_fields option also makes use of a superclass,
ExtendableMessageNano, we have two versions of the new Parcelable
superclass: one extending MessageNano, and one extending
ExtendableMessageNano. These classes are otherwise identical.
As these classes depend on Android framework jars, they are not
included in the host .jar build of the nanoproto library.
Finally, add a test suite for running tests of Android-specific
functionality, as this cannot be done on a desktop JVM.
Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497
/external/protobuf/Android.mk
|
| 4109e91ce6035f84fa32b2e949501befbfb90159 |
|
14-Jan-2014 |
Max Cai <maxtroy@google.com> |
Allow whitespace in nano codegen options.
So we don't need to keep all option in a single line in the .mk files.
Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
/external/protobuf/Android.mk
|
| cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b |
|
13-Nov-2013 |
Kristian Monsen <kristianm@google.com> |
Fix warnings warnings in header files, hide others.
Follow upstream where they have any changes in 2.5.0
Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
/external/protobuf/Android.mk
|
| d1229a35f127eb85391797f04aed1b9fe7da9fd8 |
|
08-Aug-2013 |
Wink Saville <wink@google.com> |
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
/external/protobuf/Android.mk
|
| 7e567b8b0a9e1155666752723ca835734d60ab92 |
|
24-Jul-2013 |
Ulas Kirazci <ulas@google.com> |
Add test for passing in proto params.
Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0
Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
/external/protobuf/Android.mk
|
| d1b8322fccad8946d3b32dda9f75048865a94209 |
|
25-Jun-2013 |
Wink Saville <wink@google.com> |
am 0a1429cc: Merge "Nano support for extensions and unknown fields."
* commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a':
Nano support for extensions and unknown fields.
|
| 0e055f079f53b07de3705838a7b4742ce56839f8 |
|
19-Jun-2013 |
Brian Duff <bduff@google.com> |
Nano support for extensions and unknown fields.
You can use the processor option store_unknown_fields to switch
this support on:
aprotoc --javanano_out=store_unknown_fields=true:/tmp/out
A separate option for extensions isn't required. Support
for unknown fields must be turned on to allow storing and
retrieving extensions, because they are just stored as
unknown fields. If unknown fields are switched on, extension
related code will be generated when a proto message includes
an extension range, or an extension is encountered.
By default, store_unknown_fields is false. No additional
code is generated, and the generator will error out if protos
contain extension ranges or extensions.
Change-Id: I1e034c9e8f3305612953f72438189a7da6ed2167
/external/protobuf/Android.mk
|
| b296a1e50943209b62ab96043eca698281d98a28 |
|
02-Apr-2013 |
Wink Saville <wink@google.com> |
am 216c9e86: Merge "Nano protobufs."
* commit '216c9e8681b9426e84c9e2222da5c0dd669261b2':
Nano protobufs.
|
| 64d8d8f89050c5ada85341f967af391f4716a7cb |
|
15-Mar-2013 |
Ulas Kirazci <ulas@google.com> |
Nano protobufs.
Like micro protobufs except:
- No setter/getter/hazzer functions.
- Has state is not available. Outputs all fields != their default.
- CodedInputStream can only take byte[] (not InputStream).
- Repeated fields are in arrays, not ArrayList or Vector.
- Unset messages/groups are null, not "defaultInstance()".
- Required fields are always serialized.
To use:
- Link libprotobuf-java-2.3.0-nano runtime.
- Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
/external/protobuf/Android.mk
|
| db9ab02c090cdc5d2b31399867a4052351b8793d |
|
06-Sep-2012 |
Ying Wang <wangying@google.com> |
Build against the NDK for x86 and mips too.
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
/external/protobuf/Android.mk
|
| a939d667261041b51bfa2cc746d0f6c3b6a66207 |
|
06-Nov-2012 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Add gnustl+rtti version of cpp full library
Adding new version of cpp library,
'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code
compiled against gnustl couldn't link with this library - having
both gnustl and stlport in same binary leads to nasty conflicts.
Bug: 7484202
Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
/external/protobuf/Android.mk
|
| 082bf44e4b6c03be4970d461912d1d74adbb4cff |
|
06-Sep-2012 |
Ying Wang <wangying@google.com> |
Build against the NDK for x86 and mips too.
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
/external/protobuf/Android.mk
|
| a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3 |
|
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION.
Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
/external/protobuf/Android.mk
|
| f6da580c598ac3718d65487eed1f08003ff27fd5 |
|
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION.
Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
/external/protobuf/Android.mk
|
| 77f19bf165314eb40918e43154f5047e7be8fb27 |
|
15-Jun-2012 |
Ying Wang <wangying@google.com> |
Build the target protobuf libraries against the NDK
This change unbundled the protobuf target libraries, so they can be used
in unbundled branches.
Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
/external/protobuf/Android.mk
|
| e217977611c52bccde7f7c78e1d3c790c6357431 |
|
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
/external/protobuf/Android.mk
|
| 770e6591f648204d810002aed27d0f818f9641d7 |
|
26-Jan-2011 |
Ying Wang <wangying@google.com> |
Unbundle protobuffer target libraries.
Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
/external/protobuf/Android.mk
|
| 8d24c6add5f0a6640948afccd9976b64a04a8ed3 |
|
05-Nov-2010 |
Wink Saville <wink@google.com> |
Rename protoc to aprotoc.
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.
Change-Id: I975e29e4444af9467c9b9600d5a2e7027f4046ae
/external/protobuf/Android.mk
|
| aeb2b2a40e2d1c2e210a2f4d29e534fd6ef29be4 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Build the protocol buffer compiler 'protoc'.
We need this to generate code for .proto files that have
been added to external/chromium (see change I6960c18d).
Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
/external/protobuf/Android.mk
|
| b854f4d90094e0e0b3b63b199fd9c26279d77245 |
|
05-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make these modules optional.
This allows compiling this code in Gingerbread.
Bug: 3064326
Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
/external/protobuf/Android.mk
|
| 373caa091181f70951688e5b34eafd3bcac96716 |
|
01-Oct-2010 |
Omari Stephens <xsdg@android.com> |
Make protobuf usable by host-side java apps
Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
/external/protobuf/Android.mk
|
| 732aaf0089505130cea55633bcfb2fdf5111f380 |
|
29-Jun-2010 |
Wink Saville <wink@google.com> |
Add libprotobuf-cpp-2.3.0-full.
Add full c++ version of libprotobuf as a static library.
Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
/external/protobuf/Android.mk
|
| a3d3079a7ea18b2c052842272949247b7b4601e9 |
|
05-Jun-2010 |
Wink Saville <wink@google.com> |
Add libprotobuf-java-2.3.0-lite.
Also, have all the libraries follow the same naming convention so
rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro.
Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
/external/protobuf/Android.mk
|
| 5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00 |
|
04-Jun-2010 |
Kenny Root <kroot@google.com> |
Skip stlport for simulator
The host's stl library conflicts with stlport, so we need to exclude
stlport from inclusion in the build if we're targeting the simulator.
Change-Id: Ib4da6140f4b8abb271d8e67636ccec2a796c8c5a
/external/protobuf/Android.mk
|
| b3fe74bb7067581371f487b12112b62ef8e66b9e |
|
04-Jun-2010 |
Wink Saville <wink@google.com> |
Add libprotobuf-cpp-2.3.0-lite
Added android/config.h which will be used to configure
android builds of libraries. Currently I've undef HAVE_HASH_MAP
and HAVE_HASH_SET as the versions in stlport generated compile
errors.
Updated .gitignore to be more selective on what it ignores so
android/config.h wouldn't be ignored.
Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
/external/protobuf/Android.mk
|
| ede38fe9b9f93888e6e41afc7abb09525f44da95 |
|
28-May-2010 |
Wink Saville <wink@google.com> |
Add support for Java micro protobuf's to protobuf-2.2.0a.
See README.android for additional information.
Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
/external/protobuf/Android.mk
|
| 79a4a60053f74ab71c7c3ec436d2f6caedc5be61 |
|
28-May-2010 |
Wink Saville <wink@google.com> |
The Android specific files prior to adding protobuf 2.2.0a sources.
Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
/external/protobuf/Android.mk
|