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

Side by Side Diff: remoting/host/installer/win/BUILD.gn

Issue 2350813002: Fixing regression in Windows Host Package GN target (Closed)
Patch Set: Created 4 years, 3 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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("//remoting/build/config/remoting_build.gni") 5 import("//remoting/build/config/remoting_build.gni")
6 import("//remoting/host/installer/win/generate_clsids.gni") 6 import("//remoting/host/installer/win/generate_clsids.gni")
7 import("//build/toolchain/win/midl.gni") 7 import("//build/toolchain/win/midl.gni")
8 import("//build/win/message_compiler.gni") 8 import("//build/win/message_compiler.gni")
9 9
10 action("remoting_me2me_host_archive") { 10 action("remoting_me2me_host_archive") {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 _official_build = "0" 44 _official_build = "0"
45 } 45 }
46 46
47 # Due to GN build issue http://crbug.com/633650, we need to actively set 47 # Due to GN build issue http://crbug.com/633650, we need to actively set
48 # inputs parameter to tell GN to depend on these files. So change to each 48 # inputs parameter to tell GN to depend on these files. So change to each
49 # following files will trigger this target to be rebuilt. 49 # following files will trigger this target to be rebuilt.
50 # TODO(zijiehe): Remove inputs parameter once bug 633650 has been 50 # TODO(zijiehe): Remove inputs parameter once bug 633650 has been
51 # addressed. 51 # addressed.
52 inputs = [ 52 inputs = [
53 "$root_out_dir/remote_assistance_host.exe", 53 "$root_out_dir/remote_assistance_host.exe",
54 "$root_out_dir/remote_assistance_host_uiaccess.exe",
54 "$root_out_dir/remote_security_key.exe", 55 "$root_out_dir/remote_security_key.exe",
55 "$root_out_dir/remoting_core.dll", 56 "$root_out_dir/remoting_core.dll",
56 "$root_out_dir/remoting_desktop.exe", 57 "$root_out_dir/remoting_desktop.exe",
57 "$root_out_dir/remoting_host.exe", 58 "$root_out_dir/remoting_host.exe",
58 "$root_out_dir/remoting_native_messaging_host.exe", 59 "$root_out_dir/remoting_native_messaging_host.exe",
59 "$root_out_dir/remoting_start_host.exe", 60 "$root_out_dir/remoting_start_host.exe",
60 "$root_gen_dir/remoting/CREDITS.txt", 61 "$root_gen_dir/remoting/CREDITS.txt",
61 "$root_out_dir/remoting/com.google.chrome.remote_assistance.json", 62 "$root_out_dir/remoting/com.google.chrome.remote_assistance.json",
62 "$root_out_dir/remoting/com.google.chrome.remote_desktop.json", 63 "$root_out_dir/remoting/com.google.chrome.remote_desktop.json",
63 "$root_out_dir/icudtl.dat", 64 "$root_out_dir/icudtl.dat",
64 ] 65 ]
65 66
66 _generated_files = rebase_path(inputs, root_build_dir) 67 _generated_files = rebase_path(inputs, root_build_dir)
67 _generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ] 68 _generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ]
68 69
69 # _generated_dst_files must contain the same files in the same order as 70 # _generated_dst_files must contain the same files in the same order as
70 # _generated_files, otherwise the Windows MSI will not be built correctly. 71 # _generated_files, otherwise the Windows MSI will not be built correctly.
71 _generated_dst_files = [ 72 _generated_dst_files = [
72 "files/remote_assistance_host.exe", 73 "files/remote_assistance_host.exe",
74 "files/remote_assistance_host_uiaccess.exe",
73 "files/remote_security_key.exe", 75 "files/remote_security_key.exe",
74 "files/remoting_core.dll", 76 "files/remoting_core.dll",
75 "files/remoting_desktop.exe", 77 "files/remoting_desktop.exe",
76 "files/remoting_host.exe", 78 "files/remoting_host.exe",
77 "files/remoting_native_messaging_host.exe", 79 "files/remoting_native_messaging_host.exe",
78 "files/remoting_start_host.exe", 80 "files/remoting_start_host.exe",
79 "files/CREDITS.txt", 81 "files/CREDITS.txt",
80 "files/com.google.chrome.remote_assistance.json", 82 "files/com.google.chrome.remote_assistance.json",
81 "files/com.google.chrome.remote_desktop.json", 83 "files/com.google.chrome.remote_desktop.json",
82 "files/icudtl.dat", 84 "files/icudtl.dat",
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 msi_script_arch, 135 msi_script_arch,
134 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", 136 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
135 root_build_dir), 137 root_build_dir),
136 rebase_path(outputs[0], root_build_dir), 138 rebase_path(outputs[0], root_build_dir),
137 ] 139 ]
138 } 140 }
139 } else { 141 } else {
140 group("remoting_host_installation") { 142 group("remoting_host_installation") {
141 } 143 }
142 } 144 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698