Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Issue 11347026: Check in protobuf java code and generate lite jar. (Closed)

Created:
8 years, 1 month ago by nyquist
Modified:
8 years, 1 month ago
Reviewers:
Nico, Philippe
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Visibility:
Public.

Description

Check in protobuf java code and generate lite jar. Since we only need the lite version of protobuf, we generate a jar file based on includes in the maven pom.xml file for the lite profile. BUG=158382 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167557

Patch Set 1 #

Total comments: 3

Patch Set 2 : Checks in java files, and builds jar dynamically #

Patch Set 3 : Automate lite profile for ant. Use python wrapper scripts. #

Patch Set 4 : Add comment about java.gypi variables #

Total comments: 2

Patch Set 5 : Rebased after reverting protobuf descriptor change #

Patch Set 6 : Fixed id_path in pom.xml parser #

Patch Set 7 : Change to use python2.6 supported syntax for ElementTree #

Patch Set 8 : Moved target to android conditional #

Unified diffs Side-by-side diffs Delta from patch set Stats (+26868 lines, -310 lines) Patch
M build/android/ant/chromium-jars.xml View 1 2 3 4 5 6 7 3 chunks +8 lines, -0 lines 0 comments Download
M build/java.gypi View 1 2 3 4 5 6 7 3 chunks +6 lines, -0 lines 0 comments Download
M third_party/protobuf/README.chromium View 1 2 3 4 5 6 7 2 chunks +11 lines, -0 lines 0 comments Download
A third_party/protobuf/java/README.txt View 1 2 3 4 5 6 7 1 chunk +96 lines, -0 lines 0 comments Download
A third_party/protobuf/java/pom.xml View 1 2 3 4 5 6 7 1 chunk +186 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/AbstractMessage.java View 1 2 3 4 5 6 7 1 chunk +764 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/AbstractMessageLite.java View 1 2 3 4 5 6 7 1 chunk +325 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/BlockingRpcChannel.java View 1 2 3 4 5 6 7 1 chunk +19 lines, -19 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/BlockingService.java View 1 2 3 4 5 6 7 1 chunk +29 lines, -26 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/ByteString.java View 1 2 3 4 5 6 7 1 chunk +403 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/CodedInputStream.java View 1 2 3 4 5 6 7 1 chunk +885 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/CodedOutputStream.java View 1 2 3 4 5 6 7 1 chunk +1081 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/Descriptors.java View 1 2 3 4 5 6 7 1 chunk +1887 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/DynamicMessage.java View 1 2 3 4 5 6 7 1 chunk +438 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/ExtensionRegistry.java View 1 2 3 4 5 6 7 1 chunk +266 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java View 1 2 3 4 5 6 7 1 chunk +169 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/FieldSet.java View 1 2 3 4 5 6 7 1 chunk +788 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/GeneratedMessage.java View 1 2 3 4 5 6 7 1 chunk +1834 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java View 1 2 3 4 5 6 7 1 chunk +731 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/Internal.java View 1 2 3 4 5 6 7 1 chunk +206 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java View 1 2 3 4 5 6 7 1 chunk +93 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/LazyStringArrayList.java View 1 2 3 4 5 6 7 1 chunk +155 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/LazyStringList.java View 1 2 3 4 5 6 7 1 chunk +37 lines, -28 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/Message.java View 1 2 3 4 5 6 7 1 chunk +215 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/MessageLite.java View 1 2 3 4 5 6 7 1 chunk +325 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java View 1 2 3 4 5 6 7 1 chunk +24 lines, -17 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/MessageOrBuilder.java View 1 2 3 4 5 6 7 1 chunk +110 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java View 1 2 3 4 5 6 7 1 chunk +22 lines, -16 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java View 1 2 3 4 5 6 7 1 chunk +696 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/RpcCallback.java View 1 2 3 4 5 6 7 1 chunk +15 lines, -19 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/RpcChannel.java View 1 2 3 4 5 6 7 1 chunk +71 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/RpcController.java View 1 2 3 4 5 6 7 1 chunk +118 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/RpcUtil.java View 1 2 3 4 5 6 7 1 chunk +135 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/Service.java View 1 2 3 4 5 6 7 1 chunk +117 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/main/java/com/google/protobuf/ServiceException.java View 1 2 3 4 5 6 7 1 chunk +21 lines, -27 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java View 1 2 3 4 5 6 7 1 chunk +241 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/SmallSortedMap.java View 1 2 3 4 5 6 7 1 chunk +618 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/TextFormat.java View 1 2 3 4 5 6 7 1 chunk +1476 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/UninitializedMessageException.java View 1 2 3 4 5 6 7 1 chunk +99 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/UnknownFieldSet.java View 1 2 3 4 5 6 7 1 chunk +953 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java View 1 2 3 4 5 6 7 1 chunk +146 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/main/java/com/google/protobuf/WireFormat.java View 1 2 3 4 5 6 7 1 chunk +163 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/AbstractMessageTest.java View 1 2 3 4 5 6 7 1 chunk +460 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/CodedInputStreamTest.java View 1 2 3 4 5 6 7 1 chunk +528 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java View 1 2 3 4 5 6 7 1 chunk +318 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java View 1 2 3 4 5 6 7 1 chunk +44 lines, -44 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/DescriptorsTest.java View 1 2 3 4 5 6 7 1 chunk +460 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/DynamicMessageTest.java View 1 2 3 4 5 6 7 1 chunk +226 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java View 1 2 3 4 5 6 7 1 chunk +17 lines, -27 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java View 1 2 3 4 5 6 7 1 chunk +980 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java View 1 2 3 4 5 6 7 1 chunk +118 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java View 1 2 3 4 5 6 7 1 chunk +115 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/LiteTest.java View 1 2 3 4 5 6 7 1 chunk +148 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/MessageTest.java View 1 2 3 4 5 6 7 1 chunk +313 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/NestedBuildersTest.java View 1 2 3 4 5 6 7 1 chunk +185 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java View 1 2 3 4 5 6 7 1 chunk +190 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/ServiceTest.java View 1 2 3 4 5 6 7 1 chunk +320 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java View 1 2 3 4 5 6 7 1 chunk +155 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/SmallSortedMapTest.java View 1 2 3 4 5 6 7 1 chunk +420 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/TestBadIdentifiers.java View 1 2 3 4 5 6 7 1 chunk +18 lines, -27 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/TestUtil.java View 1 2 3 4 5 6 7 1 chunk +3811 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/TextFormatTest.java View 1 2 3 4 5 6 7 1 chunk +752 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java View 1 2 3 4 5 6 7 1 chunk +437 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java View 1 2 3 4 5 6 7 1 chunk +152 lines, -0 lines 0 comments Download
A third_party/protobuf/java/src/test/java/com/google/protobuf/WireFormatTest.java View 1 2 3 4 5 6 7 1 chunk +427 lines, -0 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/multiple_files_test.proto View 1 2 3 4 5 6 7 1 chunk +28 lines, -18 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/nested_builders_test.proto View 1 2 3 4 5 6 7 1 chunk +16 lines, -6 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension.proto View 1 2 3 4 5 6 7 1 chunk +9 lines, -7 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension_lite.proto View 1 2 3 4 5 6 7 1 chunk +11 lines, -6 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/non_nested_extension.proto View 1 2 3 4 5 6 7 1 chunk +11 lines, -6 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto View 1 2 3 4 5 6 7 1 chunk +13 lines, -6 lines 0 comments Download
A + third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto View 1 2 3 4 5 6 7 1 chunk +52 lines, -11 lines 0 comments Download
M third_party/protobuf/protobuf.gyp View 1 2 3 4 5 6 7 1 chunk +46 lines, -0 lines 0 comments Download
A third_party/protobuf/protobuf_lite_java_descriptor_proto.py View 1 2 3 4 5 6 7 1 chunk +49 lines, -0 lines 0 comments Download
A third_party/protobuf/protobuf_lite_java_parse_pom.py View 1 2 3 4 5 6 7 1 chunk +57 lines, -0 lines 0 comments Download

Messages

Total messages: 20 (0 generated)
nyquist
8 years, 1 month ago (2012-10-29 23:25:00 UTC) #1
Nico
pliard has been doing a lot of work in protobuf. Maybe he can comment if ...
8 years, 1 month ago (2012-10-30 04:26:55 UTC) #2
nyquist
http://codereview.chromium.org/11347026/diff/1/third_party/protobuf/README.chromium File third_party/protobuf/README.chromium (right): http://codereview.chromium.org/11347026/diff/1/third_party/protobuf/README.chromium#newcode19 third_party/protobuf/README.chromium:19: Note: Remember to use the lite profile with "mvn ...
8 years, 1 month ago (2012-10-30 04:50:32 UTC) #3
Nico
On Mon, Oct 29, 2012 at 9:50 PM, <nyquist@chromium.org> wrote: > > http://codereview.chromium.org/11347026/diff/1/third_party/protobuf/README.chromium > File ...
8 years, 1 month ago (2012-10-30 05:07:59 UTC) #4
nyquist
On 2012/10/30 05:07:59, Nico wrote: > On Mon, Oct 29, 2012 at 9:50 PM, <mailto:nyquist@chromium.org> ...
8 years, 1 month ago (2012-10-30 05:11:03 UTC) #5
Philippe
https://codereview.chromium.org/11347026/diff/1/third_party/protobuf/README.chromium File third_party/protobuf/README.chromium (right): https://codereview.chromium.org/11347026/diff/1/third_party/protobuf/README.chromium#newcode19 third_party/protobuf/README.chromium:19: Note: Remember to use the lite profile with "mvn ...
8 years, 1 month ago (2012-10-30 08:59:28 UTC) #6
Nico
On Tue, Oct 30, 2012 at 1:59 AM, <pliard@chromium.org> wrote: > > https://codereview.chromium.org/11347026/diff/1/third_party/protobuf/README.chromium > File ...
8 years, 1 month ago (2012-10-30 15:56:32 UTC) #7
Philippe
On 2012/10/30 15:56:32, Nico wrote: > On Tue, Oct 30, 2012 at 1:59 AM, <mailto:pliard@chromium.org> ...
8 years, 1 month ago (2012-10-30 16:08:35 UTC) #8
nyquist
PTAL All files in third_party/protobuf/java/ are untouched. Now automatically builds a jar with the lite ...
8 years, 1 month ago (2012-11-08 22:34:52 UTC) #9
Philippe
On 2012/11/08 22:34:52, nyquist wrote: > PTAL > All files in third_party/protobuf/java/ are untouched. > ...
8 years, 1 month ago (2012-11-09 16:38:31 UTC) #10
Nico
lgtm Only android will depend on this, this won't be built for desktop chrome, right? ...
8 years, 1 month ago (2012-11-09 17:44:51 UTC) #11
nyquist
On 2012/11/09 17:44:51, Nico wrote: > lgtm > > Only android will depend on this, ...
8 years, 1 month ago (2012-11-09 17:46:53 UTC) #12
nyquist
http://codereview.chromium.org/11347026/diff/33016/third_party/protobuf/README.chromium File third_party/protobuf/README.chromium (right): http://codereview.chromium.org/11347026/diff/33016/third_party/protobuf/README.chromium#newcode32 third_party/protobuf/README.chromium:32: 'javac_includes' variable in protobuf_lite_java GYP target. On 2012/11/09 17:44:51, ...
8 years, 1 month ago (2012-11-09 17:47:07 UTC) #13
Nico
lgtm! On Fri, Nov 9, 2012 at 9:47 AM, <nyquist@chromium.org> wrote: > > http://codereview.chromium.org/11347026/diff/33016/third_party/protobuf/README.chromium > ...
8 years, 1 month ago (2012-11-09 17:51:56 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/nyquist@chromium.org/11347026/23052
8 years, 1 month ago (2012-11-13 05:44:36 UTC) #15
commit-bot: I haz the power
Retried try job too often for step(s) compile
8 years, 1 month ago (2012-11-13 05:53:46 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/nyquist@chromium.org/11347026/19068
8 years, 1 month ago (2012-11-13 20:44:12 UTC) #17
commit-bot: I haz the power
Sorry for I got bad news for ya. Compile failed with a clobber build on ...
8 years, 1 month ago (2012-11-13 21:38:35 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/nyquist@chromium.org/11347026/19068
8 years, 1 month ago (2012-11-13 22:57:20 UTC) #19
commit-bot: I haz the power
8 years, 1 month ago (2012-11-14 01:23:43 UTC) #20
Change committed as 167557

Powered by Google App Engine
This is Rietveld 408576698