Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//build/config/win/manifest.gni") | 7 import("//build/config/win/manifest.gni") |
| 8 import("//build/util/version.gni") | 8 import("//build/util/version.gni") |
| 9 import("//remoting/remoting_enable.gni") | 9 import("//remoting/remoting_enable.gni") |
| 10 import("//remoting/remoting_locales.gni") | 10 import("//remoting/remoting_locales.gni") |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 604 "/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE", | 604 "/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE", |
| 605 "/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE", | 605 "/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE", |
| 606 "/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE", | 606 "/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE", |
| 607 "/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE", | 607 "/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE", |
| 608 ] | 608 ] |
| 609 | 609 |
| 610 libs = [ | 610 libs = [ |
| 611 "comctl32.lib", | 611 "comctl32.lib", |
| 612 "rpcns4.lib", | 612 "rpcns4.lib", |
| 613 "rpcrt4.lib", | 613 "rpcrt4.lib", |
| 614 "sas.lib", | |
| 614 "uuid.lib", | 615 "uuid.lib", |
| 615 "wtsapi32.lib", | 616 "wtsapi32.lib", |
| 616 ] | 617 ] |
| 617 | 618 |
| 618 if (is_clang) { | 619 if (is_clang) { |
| 619 cflags = [ "-Wno-header-hygiene" ] | 620 cflags = [ "-Wno-header-hygiene" ] |
| 620 } | 621 } |
| 621 } | 622 } |
| 622 | 623 |
| 623 # GYP version: //remoting/remoting_host_win.gypi:remoting_desktop | 624 # GYP version: //remoting/remoting_host_win.gypi:remoting_desktop |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1079 "$root_out_dir/remoting_host.exe", | 1080 "$root_out_dir/remoting_host.exe", |
| 1080 "$root_out_dir/remoting_native_messaging_host.exe", | 1081 "$root_out_dir/remoting_native_messaging_host.exe", |
| 1081 "$root_out_dir/remoting_start_host.exe", | 1082 "$root_out_dir/remoting_start_host.exe", |
| 1082 "$root_gen_dir/remoting/CREDITS.txt", | 1083 "$root_gen_dir/remoting/CREDITS.txt", |
| 1083 "$root_out_dir/remoting/com.google.chrome.remote_assistance.js on", | 1084 "$root_out_dir/remoting/com.google.chrome.remote_assistance.js on", |
| 1084 "$root_out_dir/remoting/com.google.chrome.remote_desktop.json" , | 1085 "$root_out_dir/remoting/com.google.chrome.remote_desktop.json" , |
| 1085 "$root_out_dir/icudtl.dat", | 1086 "$root_out_dir/icudtl.dat", |
| 1086 ], | 1087 ], |
| 1087 root_build_dir) | 1088 root_build_dir) |
| 1088 _extra_files = [] | 1089 _extra_files = [] |
| 1089 if (is_chrome_branded) { | |
| 1090 if (target_cpu == "x64") { | |
| 1091 _redist_cpu_path = "amd64" | |
| 1092 } else { | |
| 1093 _redist_cpu_path = "x86" | |
| 1094 } | |
| 1095 _generated_files += | |
| 1096 [ rebase_path("//third_party/platformsdk_win7/files/Redist/" + | |
| 1097 "$_redist_cpu_path/sas.dll", | |
|
Jamie
2016/06/03 17:49:31
Can the file be removed as well?
joedow
2016/06/03 18:11:02
I have a follow up CL which removes the remnants o
| |
| 1098 root_build_dir) ] | |
| 1099 _extra_files += [ "files/sas.dll" ] | |
| 1100 } | |
| 1101 | 1090 |
| 1102 args = [ | 1091 args = [ |
| 1103 rebase_path("$root_gen_dir/installation", root_build_dir), | 1092 rebase_path("$root_gen_dir/installation", root_build_dir), |
| 1104 rebase_path(_output, root_build_dir), | 1093 rebase_path(_output, root_build_dir), |
| 1105 "--source-file-roots", | 1094 "--source-file-roots", |
| 1106 rebase_path("//remoting/host/installer/win"), | 1095 rebase_path("//remoting/host/installer/win"), |
| 1107 "--source-files", | 1096 "--source-files", |
| 1108 rebase_path("//remoting/host/installer/win/chromoting.wxs"), | 1097 rebase_path("//remoting/host/installer/win/chromoting.wxs"), |
| 1109 rebase_path("//remoting/host/installer/win/parameters.json"), | 1098 rebase_path("//remoting/host/installer/win/parameters.json"), |
| 1110 | 1099 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1168 "--target_arch", | 1157 "--target_arch", |
| 1169 msi_script_arch, | 1158 msi_script_arch, |
| 1170 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", | 1159 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", |
| 1171 root_build_dir), | 1160 root_build_dir), |
| 1172 rebase_path(outputs[0], root_build_dir), | 1161 rebase_path(outputs[0], root_build_dir), |
| 1173 ] | 1162 ] |
| 1174 } | 1163 } |
| 1175 } | 1164 } |
| 1176 } | 1165 } |
| 1177 } | 1166 } |
| OLD | NEW |