| Index: chrome/browser/BUILD.gn
|
| diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
| index 717ea25a87c9201e99268c72991d1ab9fe15fd9e..8ec68e87a6dcae2cf37c4233b17b4832f4ef5297 100644
|
| --- a/chrome/browser/BUILD.gn
|
| +++ b/chrome/browser/BUILD.gn
|
| @@ -82,11 +82,7 @@ if (is_desktop_linux) {
|
| # require many files from it. This makes linking more efficient. However, on
|
| # Windows official builds the static library will be too large (> 32-bits) so
|
| # use source sets in that case.
|
| -if (is_mac || (is_win && is_official_build)) {
|
| - # TODO(brettw) bug 618797: Remove the mac condition. On Mac making this
|
| - # target a static_library causes a crash on startup and the browser_tests all
|
| - # fail. My guess is this is due to a required static initializer not being
|
| - # brought in.
|
| +if (is_win && is_official_build) {
|
| chrome_browser_target_type = "source_set"
|
| } else {
|
| chrome_browser_target_type = "static_library"
|
|
|