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

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

Issue 2590433003: Re-enable building both 32 and 64 bit version of the GCP port monitor. (Closed)
Patch Set: Fix some issues with 32/64 bit installation. Created 4 years 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
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 43c92f232365bfb867f68a134e658049f9ed7ba7..27bf50d65f7e3470841bdcddeaef34120475e7c5 100644
--- a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
+++ b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
@@ -14,6 +14,9 @@ group("port_monitor") {
shared_library("port_monitor_dll") {
output_name = "gcp_portmon"
+ if (current_cpu == "x64") {
+ output_name = "gcp_portmon64"
+ }
sources = [
"port_monitor.def",
@@ -33,6 +36,51 @@ shared_library("port_monitor_dll") {
libs = [ "userenv.lib" ]
}
+group("copy_gcp_portmon_binaries") {
+ deps = [
+ ":copy_gcp_portmon_dll",
+ ]
+ # TODO(pastarmovj): Find some way to reference the pdb file for the 64bit dll
+ # simply using it in the sources directive causes gn to error when generating
+ # the build files.
+}
+
+if (current_cpu == "x64") {
+ copy("copy_gcp_portmon_dll") {
+ sources = [
+ "$root_out_dir/gcp_portmon64.dll",
+ ]
+ outputs = [
+ "$root_out_dir/gcp_portmon.dll",
+ ]
+ deps = [
+ ":port_monitor_dll",
+ ]
+ }
+} else {
+ # Make sure that we have a copy of gcp_portmon64.dll in the root out
+ # directory.
+ copy("copy_gcp_portmon_dll") {
+ if (is_clang) {
+ gcp_portmon64_toolchain = "//build/toolchain/win:clang_x64"
+ } else {
+ gcp_portmon64_toolchain = "//build/toolchain/win:x64"
+ }
+ gcp_portmon64_label = ":port_monitor_dll($gcp_portmon64_toolchain)"
+
+ gcp_portmon64_out_dir = get_label_info(gcp_portmon64_label, "root_out_dir")
+ sources = [
+ "$gcp_portmon64_out_dir/gcp_portmon64.dll",
+ ]
+ outputs = [
+ "$root_out_dir/{{source_file_part}}",
+ ]
+ deps = [
+ gcp_portmon64_label,
+ ]
+ }
+}
+
source_set("lib") {
sources = [
"port_monitor.cc",
« no previous file with comments | « cloud_print/virtual_driver/win/install/setup.cc ('k') | cloud_print/virtual_driver/win/port_monitor/port_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698