diff options
| -rw-r--r-- | chrome/BUILD.gn | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/BUILD.gn | 2 | ||||
| -rw-r--r-- | third_party/libjingle/BUILD.gn | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 00284f6..dc1444e 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -114,7 +114,7 @@ shared_library("main_dll") { "//chrome/app/theme:chrome_unscaled_resources", "//content/app/resources", "//crypto", - "//net:resources", + "//net:net_resources", "//third_party/wtl", "//ui/views", #'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf' ] TODO(GYP) @@ -212,7 +212,9 @@ if (is_win) { # TODO(brettw) this duplicates "//chrome/common:version" which applies to # Linux. process_version("version_header") { - visibility = ":*" + # TODO(brettW) this should have more reduced visibility, but chrome/browser + # currently depends on this. + #visibility = ":*" source = "version.h.in" # TODO(brettw) this should move to $target_gen_dir/version.h and # source files including it should reference it via "chrome/version.h" diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 9aee4f3..2ca9668 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -309,7 +309,7 @@ static_library("ui") { sources += rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome") deps += [ - "//chrome/browser/installer/util:strings", + "//chrome/installer/util:strings", "//third_party/wtl", "//third_party/iaccessible2", "//third_party/isimpledom", diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index cc83b29..352df17 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -255,8 +255,8 @@ static_library("libjingle") { ] # From libjingle_common.gypi's conditions list. - if (is_win && !nacl_untrusted_build) { - cflags += [ "/wd4005", "\wd4267" ] + if (is_win) { + cflags = [ "/wd4005", "/wd4267" ] } forward_dependent_configs_from = [ @@ -337,7 +337,7 @@ source_set("peerconnnection_server") { ] if (is_win) { # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags += [ "/wd4309" ] + cflags = [ "/wd4309" ] } } |