Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1548)

Unified Diff: cloud_print/virtual_driver/win/port_monitor/BUILD.gn

Issue 1428123003: Clean up Windows GN toolchains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/toolchain/win/BUILD.gn ('K') | « cloud_print/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/virtual_driver/win/port_monitor/BUILD.gn
diff --git a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
index 4365337dc6134538c84fe3d768be8af234313050..bda788b155320931183e65a12c6df64f9379b2c6 100644
--- a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
+++ b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
@@ -14,7 +14,30 @@ if (target_cpu == "x86" && current_cpu == "x64") {
arch_suffix = ""
}
-shared_library("port_monitor") {
+# When compiling a 64-bit port monitor from a 32-bit build, copy the DLL to the
+# root build directory. When targeting 64-bit CPUs, there is no cross-compiling
+# so nothing extra needs to happen.
+if (target_cpu == "x86" && current_cpu == "x64") {
+ copy("port_monitor") {
+ sources = [
+ "$root_out_dir/gcp_portmon64.dll",
+ ]
+ outputs = [
+ "$root_build_dir/gcp_portmon64.dll",
+ ]
+ deps = [
+ ":port_monitor_dll",
+ ]
+ }
+} else {
+ group("port_monitor") {
+ public_deps = [
+ ":port_monitor_dll",
+ ]
+ }
+}
+
+shared_library("port_monitor_dll") {
output_name = "gcp_portmon$arch_suffix"
sources = [
« build/toolchain/win/BUILD.gn ('K') | « cloud_print/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698