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

Issue 1136623003: Media Router GYP/GN cleanup (Closed)

Created:
5 years, 7 months ago by mark a. foltz
Modified:
5 years, 7 months ago
Reviewers:
brettw, Kevin M
CC:
chromium-reviews, posciak+watch_chromium.org, media-router+watch_chromium.org, wjia+watch_chromium.org, mcasas+watch_chromium.org, feature-media-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Media Router GYP/GN cleanup: - Refactor GYP and GN files to share source lists. - Extract a proper test_support target. - Fix upstream files with new target structure. BUG=461815, 464199, 464205 Committed: https://crrev.com/9c5e5781517823c18144b0bb5b66b66a1afd6733 Cr-Commit-Position: refs/heads/master@{#330002}

Patch Set 1 #

Patch Set 2 : Remove further unnecessary files #

Patch Set 3 : Rebase and merge media_router.gypi and media_router_tests.gypi #

Patch Set 4 : Remove reference to variable that was removed #

Patch Set 5 : Remove duplicate define #

Total comments: 2

Patch Set 6 : Convert ENABLE_MEDIA_ROUTER to a global define #

Patch Set 7 : Forgot to upload additional BUILD files #

Patch Set 8 : Rebase #

Patch Set 9 : Remove dependency on unit_tests. Add missing dep. #

Patch Set 10 : Oops #

Patch Set 11 : Second attempt to fix ChromeOS dependency issue #

Patch Set 12 : Move browser_test_with_window_test to //chrome/test:test_support_unit #

Patch Set 13 : Merge MR unit/browser tests into global targets. #

Patch Set 14 : Merge file lists into chrome_tests*.gypi #

Unified diffs Side-by-side diffs Delta from patch set Stats (+117 lines, -165 lines) Patch
M .gn View 1 1 chunk +1 line, -0 lines 0 comments Download
M BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -4 lines 0 comments Download
M build/config/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +3 lines, -0 lines 0 comments Download
M chrome/browser/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/extensions/BUILD.gn View 1 2 3 4 5 6 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/browser/media/router/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +20 lines, -78 lines 0 comments Download
M chrome/browser/media/router/media_router.gyp View 1 2 3 4 5 6 7 8 9 10 11 12 5 chunks +16 lines, -36 lines 0 comments Download
A chrome/browser/media/router/media_router.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +44 lines, -0 lines 0 comments Download
D chrome/browser/media/router/media_router_tests.gypi View 1 2 1 chunk +0 lines, -24 lines 0 comments Download
M chrome/browser/ui/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -2 lines 0 comments Download
M chrome/chrome_browser_ui.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_tests.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +3 lines, -2 lines 0 comments Download
M chrome/chrome_tests_unit.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +17 lines, -3 lines 0 comments Download
M chrome/common/BUILD.gn View 1 2 3 4 5 6 2 chunks +0 lines, -6 lines 0 comments Download
M chrome/test/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 13 3 chunks +9 lines, -5 lines 0 comments Download

Messages

Total messages: 23 (6 generated)
mark a. foltz
brettw@: Can you please review the GN/GYP files outside of browser/media/router incl .gn? kmarshall@: Everything ...
5 years, 7 months ago (2015-05-07 21:17:21 UTC) #2
Kevin M
lgtm
5 years, 7 months ago (2015-05-07 22:10:58 UTC) #3
brettw
Is the file list frequently changing? For this kind of thing I would typically not ...
5 years, 7 months ago (2015-05-08 16:52:57 UTC) #4
mark a. foltz
On 2015/05/08 16:52:57, brettw wrote: > Is the file list frequently changing? For this kind ...
5 years, 7 months ago (2015-05-08 17:48:29 UTC) #5
brettw
Is there any reason to separate out the gyp files? It will be almost twice ...
5 years, 7 months ago (2015-05-08 20:38:27 UTC) #6
mark a. foltz
On 2015/05/08 20:38:27, brettw wrote: > Is there any reason to separate out the gyp ...
5 years, 7 months ago (2015-05-11 20:07:12 UTC) #7
brettw
https://codereview.chromium.org/1136623003/diff/80001/chrome/browser/media/router/BUILD.gn File chrome/browser/media/router/BUILD.gn (right): https://codereview.chromium.org/1136623003/diff/80001/chrome/browser/media/router/BUILD.gn#newcode22 chrome/browser/media/router/BUILD.gn:22: defines = [ "ENABLE_MEDIA_ROUTER=1" ] You add this define ...
5 years, 7 months ago (2015-05-11 21:53:37 UTC) #8
mark a. foltz
https://codereview.chromium.org/1136623003/diff/80001/chrome/browser/media/router/BUILD.gn File chrome/browser/media/router/BUILD.gn (right): https://codereview.chromium.org/1136623003/diff/80001/chrome/browser/media/router/BUILD.gn#newcode22 chrome/browser/media/router/BUILD.gn:22: defines = [ "ENABLE_MEDIA_ROUTER=1" ] On 2015/05/11 21:53:37, brettw ...
5 years, 7 months ago (2015-05-11 23:08:26 UTC) #9
mark a. foltz
brettw@: Friendly ping :)
5 years, 7 months ago (2015-05-12 16:36:45 UTC) #10
brettw
LGTM
5 years, 7 months ago (2015-05-12 16:58:16 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1136623003/140001
5 years, 7 months ago (2015-05-12 19:12:55 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_gn_chromeos_rel/builds/36803)
5 years, 7 months ago (2015-05-12 20:48:25 UTC) #16
mark a. foltz
After several brave attempts to get PS#11 to pass the trybots, I gave up, because ...
5 years, 7 months ago (2015-05-15 00:41:43 UTC) #17
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1136623003/260001
5 years, 7 months ago (2015-05-15 00:42:38 UTC) #20
commit-bot: I haz the power
Committed patchset #14 (id:260001)
5 years, 7 months ago (2015-05-15 01:01:58 UTC) #21
commit-bot: I haz the power
Patchset 14 (id:??) landed as https://crrev.com/9c5e5781517823c18144b0bb5b66b66a1afd6733 Cr-Commit-Position: refs/heads/master@{#330002}
5 years, 7 months ago (2015-05-15 01:02:49 UTC) #22
jam
5 years, 7 months ago (2015-05-15 01:17:57 UTC) #23
Message was sent while issue was closed.
A revert of this CL (patchset #14 id:260001) has been created in
https://codereview.chromium.org/1140183002/ by jam@chromium.org.

The reason for reverting is: Broke Linux bots on Chromium waterfall, see

http://build.chromium.org/p/chromium/builders/Linux/builds/62091
http://build.chromium.org/p/chromium/buildstatus?builder=Linux%20x64&number=3231

The error in gclient runhooks is:

gyp: Key 'dependencies' repeated at level 3 with key path 'targets.3' while
reading
/b/build/slave/Linux_x64/build/src/chrome/browser/media/router/media_router.gyp

Not sure why this didn't show up on other bots or trybots..

Powered by Google App Engine
This is Rietveld 408576698