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

Issue 1149283005: Roll src/third_party/android_protobuf 94f522f9:999188d0 (Closed)

Created:
5 years, 6 months ago by bajones
Modified:
5 years, 6 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Roll src/third_party/android_protobuf 94f522f9:999188d0 Required for use of the cardboard-java library. src/third_party/cacheinvalidation/src/proto/android_channel.proto must be updated to include "option allow_alias = true;" in the MajorVersion enum. Otherwise a build-blocking warning about duplicate enum values is raised after this roll. BUG=389343 Committed: https://crrev.com/1f68ee2ee5486be6b32f40382258dfbb295697a5 Cr-Commit-Position: refs/heads/master@{#334064}

Patch Set 1 #

Patch Set 2 : Added required .proto update #

Patch Set 3 : Updated BUILD.gn #

Patch Set 4 : Updated BUILD.gn for reals this time #

Patch Set 5 : Updated location of license file #

Patch Set 6 : Testing findbugs exception #

Patch Set 7 : Findbugs exception seems to work. Made comment better. #

Total comments: 1

Patch Set 8 : Trying jbudorick@'s suggestion #

Unified diffs Side-by-side diffs Delta from patch set Stats (+29 lines, -3 lines) Patch
M DEPS View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M third_party/android_protobuf/BUILD.gn View 1 2 3 4 chunks +13 lines, -0 lines 0 comments Download
M third_party/android_protobuf/README.chromium View 1 2 3 4 1 chunk +2 lines, -2 lines 0 comments Download
M third_party/android_protobuf/android_protobuf.gyp View 1 2 3 4 5 6 7 3 chunks +12 lines, -0 lines 0 comments Download
M third_party/cacheinvalidation/src/proto/android_channel.proto View 1 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 35 (11 generated)
bajones
Rolling to top-of-tree with a minor required change in cacheinvalidation to prevent build errors. Please ...
5 years, 6 months ago (2015-06-05 21:18:54 UTC) #1
bajones
For some reason my last attempt failed to add any of the reviewers I requested. ...
5 years, 6 months ago (2015-06-06 04:12:01 UTC) #3
Nicolas Zea
Didn't you already land that change to the cacheinvalidation folder?
5 years, 6 months ago (2015-06-08 17:55:02 UTC) #4
bajones
On 2015/06/08 17:55:02, Nicolas Zea wrote: > Didn't you already land that change to the ...
5 years, 6 months ago (2015-06-09 16:53:25 UTC) #5
Nicolas Zea
Ah, ok, cacheinvalidation LGTM then
5 years, 6 months ago (2015-06-09 17:10:49 UTC) #6
nyquist
Is there an internal CL for this as well? I wouldn't want us to fork ...
5 years, 6 months ago (2015-06-09 17:13:16 UTC) #7
bajones
On 2015/06/09 17:13:16, nyquist wrote: > Is there an internal CL for this as well? ...
5 years, 6 months ago (2015-06-09 17:17:26 UTC) #8
bajones
nyquist@, meek@: Review ping for android_protobuf/ and DEPS roll?
5 years, 6 months ago (2015-06-09 22:24:36 UTC) #9
nyquist
On 2015/06/09 17:17:26, bajones wrote: > On 2015/06/09 17:13:16, nyquist wrote: > > Is there ...
5 years, 6 months ago (2015-06-09 22:38:31 UTC) #10
Colin Meek
On 2015/06/09 22:38:31, nyquist wrote: > On 2015/06/09 17:17:26, bajones wrote: > > On 2015/06/09 ...
5 years, 6 months ago (2015-06-09 22:51:51 UTC) #11
nyquist
lgtm
5 years, 6 months ago (2015-06-09 22:52:38 UTC) #12
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149283005/20001
5 years, 6 months ago (2015-06-09 22:55:56 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: android_chromium_gn_compile_dbg on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromium_gn_compile_dbg/builds/79772)
5 years, 6 months ago (2015-06-09 23:27:49 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149283005/40001
5 years, 6 months ago (2015-06-09 23:57:29 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149283005/60001
5 years, 6 months ago (2015-06-10 00:17:12 UTC) #22
commit-bot: I haz the power
Try jobs failed on following builders: android_clang_dbg_recipe on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_dbg_recipe/builds/85177)
5 years, 6 months ago (2015-06-10 01:55:25 UTC) #24
bajones
I've corrected the license issue from the last set of tryjob failures, but I'm not ...
5 years, 6 months ago (2015-06-10 23:01:46 UTC) #25
nyquist
On 2015/06/10 23:01:46, bajones wrote: > I've corrected the license issue from the last set ...
5 years, 6 months ago (2015-06-11 05:59:01 UTC) #26
bajones
jbudorick@: Added a findbugs exception since the error is in a third party lib. Could ...
5 years, 6 months ago (2015-06-11 19:15:24 UTC) #28
jbudorick
https://codereview.chromium.org/1149283005/diff/120001/third_party/android_protobuf/android_protobuf.gyp File third_party/android_protobuf/android_protobuf.gyp (right): https://codereview.chromium.org/1149283005/diff/120001/third_party/android_protobuf/android_protobuf.gyp#newcode16 third_party/android_protobuf/android_protobuf.gyp:16: 'additional_src_dirs': [ 'src/java/src/main/java/com/google/protobuf/nano' ], I think you can just ...
5 years, 6 months ago (2015-06-11 19:31:56 UTC) #29
bajones
On 2015/06/11 19:31:56, jbudorick wrote: > https://codereview.chromium.org/1149283005/diff/120001/third_party/android_protobuf/android_protobuf.gyp > File third_party/android_protobuf/android_protobuf.gyp (right): > > https://codereview.chromium.org/1149283005/diff/120001/third_party/android_protobuf/android_protobuf.gyp#newcode16 > ...
5 years, 6 months ago (2015-06-11 20:19:47 UTC) #30
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149283005/140001
5 years, 6 months ago (2015-06-11 20:42:04 UTC) #33
commit-bot: I haz the power
Committed patchset #8 (id:140001)
5 years, 6 months ago (2015-06-11 22:57:35 UTC) #34
commit-bot: I haz the power
5 years, 6 months ago (2015-06-11 22:58:33 UTC) #35
Message was sent while issue was closed.
Patchset 8 (id:??) landed as
https://crrev.com/1f68ee2ee5486be6b32f40382258dfbb295697a5
Cr-Commit-Position: refs/heads/master@{#334064}

Powered by Google App Engine
This is Rietveld 408576698