diff options
| author | Nico Weber <thakis@chromium.org> | 2015-10-15 16:32:46 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-10-15 23:38:21 +0000 |
| commit | f167dd63e5cbf777d6b53ead21c1b3409d683551 (patch) | |
| tree | 33fa0e814b4095b4532894af07e121d00dbfa733 /cloud_print | |
| parent | 2319c18ac2f34856fdffc532201d533bba137870 (diff) | |
| download | chromium_src-f167dd63e5cbf777d6b53ead21c1b3409d683551.zip chromium_src-f167dd63e5cbf777d6b53ead21c1b3409d683551.tar.gz chromium_src-f167dd63e5cbf777d6b53ead21c1b3409d683551.tar.bz2 | |
clang/win: Fix gn build after https://codereview.chromium.org/1408623002/
The -Wno flags need to be in their own config, else the -Wno flags precede
/W4 which turns the warnings back on.
Also remove a debugging print statement that snuck in in that CL.
BUG=543870
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/1407123002 .
Cr-Commit-Position: refs/heads/master@{#354400}
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/service/win/BUILD.gn | 41 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/BUILD.gn | 2 |
2 files changed, 23 insertions, 20 deletions
diff --git a/cloud_print/service/win/BUILD.gn b/cloud_print/service/win/BUILD.gn index 211ccc33..2c050b0 100644 --- a/cloud_print/service/win/BUILD.gn +++ b/cloud_print/service/win/BUILD.gn @@ -44,24 +44,7 @@ process_version("exe_version") { output = "$target_gen_dir/cloud_print_service_exe_version.rc" } -executable("cloud_print_service_config") { - sources = [ - "cloud_print_service_config.cc", - ] - - configs -= [ "//build/config/win:console" ] - configs += [ "//build/config/win:windowed" ] - - deps = [ - ":config_version", - ":exe_manifest", - "//cloud_print/common:install_utils", - "//cloud_print/service:resources", - "//cloud_print/service:lib", - ] - - libs = [ "secur32.lib" ] - +config("cloud_print_service_config_warnings") { # TODO: Remove once cloud_print_service_config.cc no longer depends on # atlapp.h, http://crbug.com/5027 if (is_clang) { @@ -81,6 +64,28 @@ executable("cloud_print_service_config") { } } +executable("cloud_print_service_config") { + sources = [ + "cloud_print_service_config.cc", + ] + + configs -= [ "//build/config/win:console" ] + configs += [ + "//build/config/win:windowed", + ":cloud_print_service_config_warnings", + ] + + deps = [ + ":config_version", + ":exe_manifest", + "//cloud_print/common:install_utils", + "//cloud_print/service:resources", + "//cloud_print/service:lib", + ] + + libs = [ "secur32.lib" ] +} + process_version("config_version") { template_file = chrome_version_rc_template sources = [ diff --git a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn index a9e5b35..f6e727f 100644 --- a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn +++ b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn @@ -14,8 +14,6 @@ if (target_cpu == "x86" && current_cpu == "x64") { arch_suffix = "" } -print("port_monitor $current_toolchain") - shared_library("port_monitor") { output_name = "gcp_portmon$arch_suffix" |