aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Nano protobufs.Ulas Kirazci2013-04-0146-14540/+24022
| | | | | | | | | | | | | | | | | | 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.Ying Wang2012-12-141-6/+8
| | | | Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
* Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-9/+6
| | | | | Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
* Generate "modern" java to reduce warningsAndy Stadler2012-06-271-4/+20
| | | | | | | | | | | | * @SuppressWarnings("hiding") for field names that are reused in inner classes. * @Override for methods defined in com.google.protobuf.micro.MessageMicro * Removed unnecessary type casting * Only throw exception from writeTo when there are fields to write. This removes over 1,000 warnings from the Play client. Change-Id: I9049c94f1e6aec5e5547898defc03c8d379c3c10
* 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
* When computing Group and Message size use getSerializedSize.Wink Saville2012-06-111-2/+2
| | | | | Bug: 6589939 Change-Id: I3050a99b08edf48301314163d41ea6f8080ffcdb
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-6/+0
| | | | | | Bug: 5010576 Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
* Fix bug in skipRawBytes if request is larger than buffer.Wink Saville2011-06-204-2/+95
| | | | | | | Original solution by Scott Barta this change adds tests and also fixes the same bug that was in CodedInputStream. Change-Id: Idb49691822b3f292c5092edc52db4e153e9da49a
* am 7cc5f59e: Unbundle protobuffer target libraries.Ying Wang2011-02-070-0/+0
|\ | | | | | | | | * commit '7cc5f59ec79718040bb1efd8be2ed12af2de5e1a': Unbundle protobuffer target libraries.
| * Unbundle protobuffer target libraries.Ying Wang2011-02-071-0/+2
| | | | | | | | Change-Id: I3047d2cd10828844562fa57ae3b619fe919c6113
* | 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
* am 3574de1c: Remove vestigial references to StringUtf8Micro.Wink Saville2010-10-072-5/+3
|\ | | | | | | | | | | | | Merge commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9' into gingerbread-plus-aosp * commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9': Remove vestigial references to StringUtf8Micro.
| * Remove vestigial references to StringUtf8Micro.Wink Saville2010-10-062-5/+3
| | | | | | | | Change-Id: Ica75231b03de4768c671bf046b92bd7630ecd5c8
* | merge from gingerbreadJean-Baptiste Queru2010-10-051-0/+4
|\ \ | |/ | | | | Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823
| * 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 some python generated file/dirs to external/protobuf/.gitignore.Wink Saville2010-08-161-0/+11
| | | | Change-Id: If22801f80a9bfe0fa5905e07894ec4b07f6db23b
* 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
* Changed speed optimization for strings.Wink Saville2010-06-075-1001/+114
| | | | | | | | | | | Removed use of StringUtf8Micro and instead use an extra byte array instance variable directly in the class. This allows the list returned for repeated strings to be a String instead of a StringUtf8Micro making the class compatible with existing code. Removed PerfTimer.java which isn't used. Change-Id: Ie6acfb40f98f59a48c1a795d86f715078f9611f5
* 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
* Merge "Add libprotobuf-cpp-2.3.0-lite"Wink Saville2010-06-033-9/+227
|\
| * Add libprotobuf-cpp-2.3.0-liteWink Saville2010-06-033-9/+227
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix bug in generating enum class name.Wink Saville2010-06-021-11/+24
|/ | | | | | | I was not properly constructing the enum class name if there was a period in the protobuf package name. Change-Id: I71e51d9745702fa89841ad714282afe8b42a3425
* Add support for Java micro protobuf's to protobuf-2.3.0.Wink Saville2010-05-2938-1/+9888
| | | | | | See README.android for additional information. Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
* Add protobuf 2.3.0 sourcesWink Saville2010-05-29295-23173/+22145
| | | | | | | This is the contents of protobuf-2.3.0.tar.bz2 from http://code.google.com/p/protobuf/downloads/list. Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
* Add support for Java micro protobuf's to protobuf-2.2.0a.Wink Saville2010-05-2841-6/+9949
| | | | | | See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
* Add protobuf 2.2.0a sourcesWink Saville2010-05-27472-0/+267949
| | | | | | | | 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
* The Android specific files prior to adding protobuf 2.2.0a sources.Wink Saville2010-05-273-0/+32
| | | | Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: I7c626546a9c52c78e0e48749a34596235ee32a84
* am 96ccdc22: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit '96ccdc223b71f9e356d10ed3199007567996e062' * commit '96ccdc223b71f9e356d10ed3199007567996e062': android-2.1_r1 snapshot
| * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | |\ | |/ /
| | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
| | |
* | | The j2me protobuf code is now in vendor/google; remove it here.Dan Egnor2009-11-135-1890/+0
|/ /
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * \ Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-252-12/+151
| |\ \ | | |/
* | | am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from ↵Adam Bliss2009-06-112-12/+151
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | mainline Merge commit 'a67f19deb0794784d1b841bc1900328103af03c5' * commit 'a67f19deb0794784d1b841bc1900328103af03c5': Adds a few utilities to ProtoBufUtil, integrating over from mainline
| * | Adds a few utilities to ProtoBufUtil, integrating over from mainlineAdam Bliss2009-06-102-12/+151
| | |
* | | am 7fea449b: Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '7fea449b53848057686ac4266ee51853bda70e30' * commit '7fea449b53848057686ac4266ee51853bda70e30': Revert "ProtoBuf update"
| * | Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
| | | | | | | | | | | | This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
* | | am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger ↵Mitsuru Oshima2009-06-104-171/+653
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs. Merge commit '9aaf507646c866ab131bf2bcd973882ff9f553cf' * commit '9aaf507646c866ab131bf2bcd973882ff9f553cf': ProtoBuf update
| * | ProtoBuf updateMitsuru Oshima2009-06-104-171/+653
| | | | | | | | | | | | | | | | | | * Added IntMap that uses Hashtable for larger keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs.
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\ \ \ | |/ /
* | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-0/+1
| |\ | |/ |/|
* | auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-0/+1
| |
| * Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-173-44/+350
| |\ | |/ |/|