|
|
Chromium Code Reviews|
Created:
4 years, 7 months ago by nisse-chromium (ooo August 14) Modified:
4 years, 7 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. |
DescriptionDrop libjingle/source/talk directory from DEPS.
Also delete all references to libjingle from the roll_webrtc.py and checklicenses scripts.
BUG=webrtc:4256, 98310
Committed: https://crrev.com/d0fa3c06d24d1ccf0d4547aed96e605ae6bd0fa0
Cr-Commit-Position: refs/heads/master@{#393819}
Patch Set 1 #
Total comments: 3
Patch Set 2 : Address comments. #Patch Set 3 : Purge libjingle from checklicenses.py. Point to webrtc LICENSE file. #Patch Set 4 : Rebase. #
Messages
Total messages: 31 (13 generated)
nisse@chromium.org changed reviewers: + kjellander@chromium.org
Seems to work, I tested by running ./tools/roll_webrtc.py --dry-run --ignore-checks. Is there any Chrome bug number this cl ought to refer to?
Thanks for doing this! Just a few minor comments. I don't have any Chrome bug, the WebRTC bug is enough IMO. https://codereview.chromium.org/1974253003/diff/1/tools/roll_webrtc.py File tools/roll_webrtc.py (left): https://codereview.chromium.org/1974253003/diff/1/tools/roll_webrtc.py#oldcod... tools/roll_webrtc.py:165: if webrtc_current.git_commit != webrtc_new.git_commit: Please remove line 165: it should always be true now (or the CL would be a no-op, rendering no changes) It was there since there could be a roll that included Libjingle-only changes, which should not be possible anymore. https://codereview.chromium.org/1974253003/diff/1/tools/roll_webrtc.py#oldcod... tools/roll_webrtc.py:183: if webrtc_str: You can remove line 183 too after removing the check at line 165. https://codereview.chromium.org/1974253003/diff/1/tools/roll_webrtc.py#oldcod... tools/roll_webrtc.py:184: description.extend(['-m', webrtc_str]) I suggest dropping adding this to the description. It's already in the title of the CL so this is just repeating the same thing (see https://codereview.chromium.org/1920743002/ for an example CL).
Updated version. Example cl produced by the script: https://codereview.chromium.org/1980453002/
The CQ bit was checked by kjellander@chromium.org
lgtm
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1974253003/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1974253003/20001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
On 2016/05/13 12:57:52, commit-bot: I haz the power wrote: > Try jobs failed on following builders: > linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED, > https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...) Failure from webview_licenses (with patch) webview_licenses (with patch) failures: third_party/libjingle I guess this is because the file third_party/libjingle/source/talk/COPYING has disappeared together with the talk directory. There's a pointer in it in README.chromium. Should I point that to webrtc's COPYING instead, or update it in some other way? Other questions: The overrides directory contains four files (DEPS, field_trial.cc, init_webrtc.cc, and init_webrtc.h). Should they be deleted too? tools/checklicenses/checklicenses.py also has a reference to libjingle/source/talk, and to http://crbug.com/98310.
On 2016/05/13 13:26:11, nisse-chromium wrote: > On 2016/05/13 12:57:52, commit-bot: I haz the power wrote: > > Try jobs failed on following builders: > > linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED, > > > https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...) > > Failure from > > webview_licenses (with patch) webview_licenses (with patch) > failures: > third_party/libjingle > > I guess this is because the file third_party/libjingle/source/talk/COPYING has > disappeared together with the talk directory. There's a pointer in it in > README.chromium. Should I point that to webrtc's COPYING instead, or update it > in some other way? I haven't done this, but the error suggests you can "add a 'License File:' line to README.chromium with the appropriate path.". However, there's no COPYING file in Chromium's src/third_party/webrtc since it's a mirror of our webrtc/ subdir: https://chromium.googlesource.com/external/webrtc/+/master/webrtc/ So I think it's better you add a LICENSE file in src/third_party/libjingle instead (as also suggested in the error message). > Other questions: The overrides directory contains four files (DEPS, > field_trial.cc, init_webrtc.cc, and init_webrtc.h). Should they be deleted too? No, they're needed by WebRTC. > tools/checklicenses/checklicenses.py also has a reference to > libjingle/source/talk, and to http://crbug.com/98310. I guess you can remove that reference since the dir will now be gone. You'll need additional reviewer for that though (pick phajdan.jr)
On 2016/05/13 13:38:04, kjellander (chromium) wrote: > However, there's no COPYING file in Chromium's src/third_party/webrtc since it's > a mirror of our webrtc/ subdir: > https://chromium.googlesource.com/external/webrtc/+/master/webrtc/ Hmm. I have such a file. The toplevel LICENCE file says in my webrtc checkout only says "Refer to webrtc/LICENSE." So letting third_party/libjingle/README/chromium point to ../webrtc/LICENSE seems to work, at lest when I run webview_licenses locally. > > Other questions: The overrides directory contains four files (DEPS, > > field_trial.cc, init_webrtc.cc, and init_webrtc.h). Should they be deleted > too? > > No, they're needed by WebRTC. All four of them? I'm leaving them as is, then. > > tools/checklicenses/checklicenses.py also has a reference to > > libjingle/source/talk, and to http://crbug.com/98310. > > I guess you can remove that reference since the dir will now be gone. You'll > need additional reviewer for that though (pick phajdan.jr) I'll do that (and add a reference to the bug, which is going to be fixed with this cl).
Description was changed from ========== Drop libjingle/source/talk directory from DEPS. Also delete all references to libjingle from the roll_webrtc.py script. BUG=webrtc:4256 ========== to ========== Drop libjingle/source/talk directory from DEPS. Also delete all references to libjingle from the roll_webrtc.py and checklicenses scripts. BUG=webrtc:4256,98310 ==========
nisse@chromium.org changed reviewers: + phajdan.jr@chromium.org
The CQ bit was checked by nisse@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1974253003/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1974253003/40001
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: ios-device-gn on tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-gn/bui...) ios-simulator-gn on tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-gn/...)
lgtm assuming a rebased patch set passes the trybots.
The CQ bit was checked by nisse@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1974253003/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1974253003/60001
LGTM
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
The CQ bit was checked by nisse@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from kjellander@chromium.org Link to the patchset: https://codereview.chromium.org/1974253003/#ps60001 (title: "Rebase.")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1974253003/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1974253003/60001
Message was sent while issue was closed.
Description was changed from ========== Drop libjingle/source/talk directory from DEPS. Also delete all references to libjingle from the roll_webrtc.py and checklicenses scripts. BUG=webrtc:4256,98310 ========== to ========== Drop libjingle/source/talk directory from DEPS. Also delete all references to libjingle from the roll_webrtc.py and checklicenses scripts. BUG=webrtc:4256,98310 ==========
Message was sent while issue was closed.
Committed patchset #4 (id:60001)
Message was sent while issue was closed.
Description was changed from ========== Drop libjingle/source/talk directory from DEPS. Also delete all references to libjingle from the roll_webrtc.py and checklicenses scripts. BUG=webrtc:4256,98310 ========== to ========== Drop libjingle/source/talk directory from DEPS. Also delete all references to libjingle from the roll_webrtc.py and checklicenses scripts. BUG=webrtc:4256,98310 Committed: https://crrev.com/d0fa3c06d24d1ccf0d4547aed96e605ae6bd0fa0 Cr-Commit-Position: refs/heads/master@{#393819} ==========
Message was sent while issue was closed.
Patchset 4 (id:??) landed as https://crrev.com/d0fa3c06d24d1ccf0d4547aed96e605ae6bd0fa0 Cr-Commit-Position: refs/heads/master@{#393819} |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
