summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove vestigial references to StringUtf8Micro.android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1Wink Saville2010-10-062-5/+3
| | | | Change-Id: Ica75231b03de4768c671bf046b92bd7630ecd5c8
* 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/masterandroid-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1Jean-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 mainlineandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1Adam 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
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-0/+1750
| |
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-1716/+0
| |
* | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-38/+4
| |
* | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-4/+38
| |
* | auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-193-41/+312
| |
* | auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-0/+1
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
|
* Initial ContributionThe Android Open Source Project2008-10-214-0/+1444
generated by cgit v1.1 at 2024-06-09 08:28:05 +0000