summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Added a build rule for the full version of the protocol buffer library.P.Y. Laligand2015-03-111-0/+17
| | | | | | | | Only added a host-side version as the full version is unlikely to be used on the device side. b/19415609 Change-Id: Ibdd1ad589c2becff735a8cc72b7a7e5d89e45d3e
* Generate @IntDef annotations for nanoproto enums.Jeff Davidson2015-02-191-1/+7
| | | | | | | | | | @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
* Use libstdc++, not libc++_static, with protobuf.Jeff Davidson2015-02-061-2/+2
| | | | | | | | | 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
* Include libc++ statically in aprotoc.Jeff Davidson2015-02-061-0/+4
| | | | | | | | Allows us to include aprotoc as a prebuilt separate from the platform build for use in unbundled projects. Bug: 19285118 Change-Id: I05f5dbf019ab08db31c33e7d30899189175a8315
* Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-151-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add platform versions of the protobuf libraries.Dan Albert2014-11-111-0/+37
| | | | | | | | | 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
* Move protobuf 2.3.0 to prebuilts.Jeff Davidson2014-10-221-10/+13
| | | | | | | | | | | 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
* Fix the aprotoc target for Windows.Leandro Gracia Gil2014-07-281-0/+4
| | | | | | Allows aprotoc.exe to be cross-compiled when building the Windows SDK. Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
* You CANNOT change the global WITH_DEXPREOPTYing Wang2014-05-011-1/+1
| | | | | Bug: 14380196 Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
* Support generation of Parcelable nano messages.Jeff Davidson2014-04-251-0/+61
| | | | | | | | | | | | | | | | | | | | 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
* Allow whitespace in nano codegen options.Max Cai2014-01-141-1/+3
| | | | | | So we don't need to keep all option in a single line in the .mk files. Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
* Fix warnings warnings in header files, hide others.Kristian Monsen2013-11-131-3/+7
| | | | | | Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
* Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.Wink Saville2013-08-071-2/+2
| | | | Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
* Add test for passing in proto params.Ulas Kirazci2013-07-251-0/+23
| | | | | | Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
* am 0a1429cc: Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-251-0/+1
|\ | | | | | | | | * commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a': Nano support for extensions and unknown fields.
| * Nano support for extensions and unknown fields.Brian Duff2013-06-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 216c9e86: Merge "Nano protobufs."Wink Saville2013-04-011-0/+32
|\ \ | |/ | | | | | | * commit '216c9e8681b9426e84c9e2222da5c0dd669261b2': Nano protobufs.
| * Nano protobufs.Ulas Kirazci2013-04-011-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Build against the NDK for x86 and mips too.android-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1Ying Wang2012-12-141-6/+8
| | | | | | | | Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
| * Retire LOCAL_NDK_VERSION.android-sdk-support_r11android-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1Ying Wang2012-08-141-9/+6
| | | | | | | | | | Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
* | Add gnustl+rtti version of cpp full libraryPrzemyslaw Szczepaniak2012-11-081-8/+32
| | | | | | | | | | | | | | | | | | | | 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
* | Build against the NDK for x86 and mips too.Ying Wang2012-09-071-6/+8
| | | | | | | | Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
* | Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-9/+6
|/ | | | | Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
* Build the target protobuf libraries against the NDKYing Wang2012-06-151-12/+17
| | | | | | | This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
* Remove the simulator target from all makefiles.android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1Jeff Brown2011-07-111-6/+0
| | | | | | Bug: 5010576 Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
* Unbundle protobuffer target libraries.Ying Wang2011-01-261-0/+2
| | | | Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
* Rename protoc to aprotoc.Wink Saville2010-11-051-3/+4
| | | | | | | | 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
* Build the protocol buffer compiler 'protoc'.Iain Merrick2010-11-021-0/+94
| | | | | | | We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
* Make these modules optional.Jean-Baptiste Queru2010-10-051-0/+4
| | | | | | | | This allows compiling this code in Gingerbread. Bug: 3064326 Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
* Make protobuf usable by host-side java appsOmari Stephens2010-09-301-55/+80
| | | | Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
* Add libprotobuf-cpp-2.3.0-full.Wink Saville2010-06-281-16/+83
| | | | | | Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
* Add libprotobuf-java-2.3.0-lite.Wink Saville2010-06-041-1/+23
| | | | | | | 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
* Skip stlport for simulatorKenny Root2010-06-041-2/+7
| | | | | | | 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
* Add libprotobuf-cpp-2.3.0-liteWink Saville2010-06-031-2/+55
| | | | | | | | | | | | 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
* Add support for Java micro protobuf's to protobuf-2.2.0a.Wink Saville2010-05-281-2/+8
| | | | | | See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
* The Android specific files prior to adding protobuf 2.2.0a sources.Wink Saville2010-05-271-0/+18
Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
generated by cgit v1.1 at 2025-01-08 06:31:57 +0000