| Summary: | [Chromium] Merge final nits to DumpRenderTree.gyp for Android | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Adam Barth <abarth> | ||||||||
| Component: | New Bugs | Assignee: | Adam Barth <abarth> | ||||||||
| Status: | RESOLVED FIXED | ||||||||||
| Severity: | Normal | CC: | japhet, peter, tony, wangxianzhu, webkit.review.bot | ||||||||
| Priority: | P2 | ||||||||||
| Version: | 528+ (Nightly build) | ||||||||||
| Hardware: | Unspecified | ||||||||||
| OS: | Unspecified | ||||||||||
| Bug Depends on: | 90947, 92858, 92865 | ||||||||||
| Bug Blocks: | 66687 | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Adam Barth
2012-07-10 16:57:21 PDT
Created attachment 151554 [details]
Patch
LGTM Comment on attachment 151554 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151554&action=review > Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:256 > + ['exclude', 'WebUserMediaClientMock\\.cpp'], nit: This whole file is guarded with ENABLE(MEDIA_STREAM), which isn't the case for Android. Could probably revert this downstream instead. OK. Will do. Created attachment 151598 [details]
Patch for landing
Comment on attachment 151598 [details] Patch for landing Clearing flags on attachment: 151598 Committed r122301: <http://trac.webkit.org/changeset/122301> All reviewed patches have been landed. Closing bug. Re-opened since this is blocked by 90947 This relies on some not-yet-upstreamed Chromium code. I've e-mailed the author with some questions, so we can hopefully get this in tomorrow. For reference: https://gerrit-int.chromium.org/#change,19828 > This relies on some not-yet-upstreamed Chromium code. I've e-mailed the author with some questions, so we can hopefully get this in tomorrow.
@Peter: Are we ready to land this patch yet?
Per http://crrev.com/148790 the sdk_build variable will be pushed to gyp, but I'm not sure if it's propagated properly yet. I had to revert the revision last week as it unintentionally switched the WebKit cr-android builder to using ninja. That has been fixed in the re-land, so we can go forth, roll WebKit Chromium DEPS and, if needed, fix propagation of the variable (though that'd be easy). Tomorrow -finally- is reasonable. IIRC a similar one-line diff exists for TestWebKitAPI and webkit_unit_test. Ok. Thanks. There isn't really a rush. We'll just need to get this off our plate eventually. After https://gerrit-int.chromium.org/22653 lands, this one-line change will be the last thing keeping us from having DumpRenderTree fully unforked. Once a new Chromium DEPS roll happens in WebKit (only blocked on getting a Chromium LKGR > 149181), it's fine to land this. Should be today :-). Comment on attachment 151598 [details]
Patch for landing
Boldly setting cq+.
Comment on attachment 151598 [details] Patch for landing Clearing flags on attachment: 151598 Committed r124325: <http://trac.webkit.org/changeset/124325> All reviewed patches have been landed. Closing bug. Re-opened since this is blocked by 92865 Comment on attachment 151598 [details] Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=151598&action=review > Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:454 > + '--ant-compile=<(sdk_build)', "--sdk-build=<(sdk_build)", then LGTM again.. Thanks! Created attachment 156095 [details]
Patch for landing
Comment on attachment 156095 [details] Patch for landing Clearing flags on attachment: 156095 Committed r124467: <http://trac.webkit.org/changeset/124467> All reviewed patches have been landed. Closing bug. |