| commit | 249b7e3ba14feddb09e0885b64a8478f98ad9c4d | [log] [tgz] |
|---|---|---|
| author | dpapad <[email protected]> | Tue May 31 19:02:21 2022 |
| committer | Chromium LUCI CQ <[email protected]> | Tue May 31 19:02:21 2022 |
| tree | 0f0763c7d3c31c7ee7ea8ab75b32c34335f2f1fe | |
| parent | 32096271f5bec0ff3b53b548b8cfe7636134ab9f [diff] [blame] |
Migrate chrome://conflicts to TypeScript. Bug: 1316438 Change-Id: I4b03d0b7eddc31c6b9d6a8fb02a9a3fd6d216aba Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3672937 Commit-Queue: Demetrios Papadopoulos <[email protected]> Reviewed-by: Patrick Monette <[email protected]> Cr-Commit-Position: refs/heads/main@{#1009204}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 47efba5..367b863d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -7627,6 +7627,10 @@ } } + if (is_win) { + deps += [ "//chrome/browser/resources/conflicts:build_ts" ] + } + if (is_win || is_mac || is_linux || is_chromeos || is_fuchsia) { deps += [ "//chrome/browser/resources/gaia_auth_host:modulize",