Commit Graph

32 Commits

Author SHA1 Message Date
Bo Yang
5db217305f down-integrate internal changes 2015-05-21 19:32:02 -07:00
Dan Albert
68e7e78257 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
2014-11-11 11:03:23 -08:00
Jeff Davidson
dac016786a 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
2014-10-22 10:00:30 -07:00
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
2014-07-28 15:27:21 -07:00
Ying Wang
d75027090c You CANNOT change the global WITH_DEXPREOPT
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
2014-05-01 20:45:22 -07:00
Jeff Davidson
ec4b1ce0b6 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
2014-04-25 14:34:55 -07:00
Max Cai
bc8eec3d2b 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
2014-01-14 15:03:05 +00:00
Kristian Monsen
eee1dd7bbf Fix warnings warnings in header files, hide others.
Follow upstream where they have any changes in 2.5.0

Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
2013-11-13 12:06:41 -08:00
Wink Saville
473985e07e Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
2013-08-07 21:00:39 -07:00
Ulas Kirazci
2000cfdc2a Add test for passing in proto params.
Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0

Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
2013-07-25 12:53:36 -07:00
Wink Saville
50acfdac08 am 0a1429cc: Merge "Nano support for extensions and unknown fields."
* commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a':
  Nano support for extensions and unknown fields.
2013-06-25 09:56:06 -07:00
Brian Duff
5659cca8c8 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
2013-06-24 16:02:12 -07:00
Wink Saville
08b6e50a9b am 216c9e86: Merge "Nano protobufs."
* commit '216c9e8681b9426e84c9e2222da5c0dd669261b2':
  Nano protobufs.
2013-04-01 18:05:23 -07:00
Ulas Kirazci
2337023fd9 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
2013-04-01 14:55:45 -07:00
Ying Wang
c991c16e92 Build against the NDK for x86 and mips too.
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
2012-12-14 18:19:15 -08:00
Przemyslaw Szczepaniak
610c2fd73d 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
2012-11-08 17:26:05 +00:00
Ying Wang
b67a8ec635 Build against the NDK for x86 and mips too.
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
2012-09-07 09:30:03 -07:00
Ying Wang
b74eb3fc65 Retire LOCAL_NDK_VERSION.
Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
2012-08-14 12:02:51 -07:00
Ying Wang
64227227e7 Retire LOCAL_NDK_VERSION.
Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
2012-08-14 10:28:02 -07:00
Ying Wang
4747b03ac1 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
2012-06-15 14:37:32 -07:00
Jeff Brown
17892bccbb Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
2011-07-11 22:12:04 -07:00
Ying Wang
ddf74061de Unbundle protobuffer target libraries.
Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
2011-01-26 13:37:44 -08:00
Wink Saville
4e79aac882 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
2010-11-05 11:28:46 -07:00
Iain Merrick
f5bc288bb2 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
2010-11-02 14:44:37 +00:00
Jean-Baptiste Queru
6ebe2303fd Make these modules optional.
This allows compiling this code in Gingerbread.

Bug: 3064326

Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
2010-10-05 10:26:34 -07:00
Omari Stephens
aa6776432a Make protobuf usable by host-side java apps
Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
2010-09-30 18:50:26 -07:00
Wink Saville
7d0a2a3c88 Add libprotobuf-cpp-2.3.0-full.
Add full c++ version of libprotobuf as a static library.

Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
2010-06-28 15:05:24 -07:00
Wink Saville
e9da248ad9 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
2010-06-04 17:44:37 -07:00
Kenny Root
c0333631e1 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
2010-06-04 09:39:02 -07:00
Wink Saville
acf8ef12d0 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
2010-06-03 15:33:07 -07:00
Wink Saville
e5566f8673 Add support for Java micro protobuf's to protobuf-2.2.0a.
See README.android for additional information.

Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
2010-05-28 11:49:52 -07:00
Wink Saville
f9e5cc7058 The Android specific files prior to adding protobuf 2.2.0a sources.
Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
2010-05-27 15:44:42 -07:00