Skip to content

Commit

Permalink
Merge pull request #394 from squalus/win-65-fixes
Browse files Browse the repository at this point in the history
Windows build fixes
  • Loading branch information
Eloston authored Apr 19, 2018
2 parents e582ad4 + 0395959 commit fabb6e9
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 33 deletions.
1 change: 0 additions & 1 deletion resources/config_bundles/windows/gn_flags.map
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ rtc_use_lto=false
target_cpu="x64"
use_lld=true
use_jumbo_build=true
is_multi_dll_chrome=false
1 change: 0 additions & 1 deletion resources/config_bundles/windows/patch_order.list
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ ungoogled-chromium/windows/windows-disable-win-build-output.patch
ungoogled-chromium/windows/windows-disable-orderfile.patch
ungoogled-chromium/windows/windows-disable-rcpy.patch
ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch
ungoogled-chromium/windows/windows-fix-non-multi-dll-build.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Disable reordering imports and fix linking for iridium patches
# Disable reordering imports

--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
Expand Down Expand Up @@ -61,14 +61,6 @@

sources = []
if (!is_win && use_aura) {
@@ -397,6 +361,7 @@ if (is_win) {
"//third_party/cld_3/src/src:cld_3",
"//third_party/wtl",
"//ui/views",
+ "//iridium:trknotify",
]

ldflags = [
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -36,10 +36,6 @@ group("telemetry_chrome_test") {
Expand Down

This file was deleted.

0 comments on commit fabb6e9

Please sign in to comment.