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

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

Issue 2098773003: [Mac/GN] Add missing import //build/config/zip.gni after cf63a9a5e547. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 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("//chrome/version.gni") 9 import("//chrome/version.gni")
10 import("//remoting/remoting_enable.gni") 10 import("//remoting/remoting_enable.gni")
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 [ 1132 [
1133 "--defs", 1133 "--defs",
1134 "BRANDING=$_branding", 1134 "BRANDING=$_branding",
1135 "DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}", 1135 "DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}",
1136 "RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}", 1136 "RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}",
1137 "VERSION=$chrome_version_full", 1137 "VERSION=$chrome_version_full",
1138 "OFFICIAL_BUILD=$_official_build", 1138 "OFFICIAL_BUILD=$_official_build",
1139 ] 1139 ]
1140 } 1140 }
1141 } else if (is_mac && is_chrome_branded) { 1141 } else if (is_mac && is_chrome_branded) {
1142 import("//build/config/zip.gni")
1142 zip("remoting_me2me_host_archive") { 1143 zip("remoting_me2me_host_archive") {
1143 # TODO(crbug.com/622415) - This list of inputs is totally wrong 1144 # TODO(crbug.com/622415) - This list of inputs is totally wrong
1144 # and we need the real installer ported over from 1145 # and we need the real installer ported over from
1145 # remoting/remoting_host_mac.gypi but for now this creates at 1146 # remoting/remoting_host_mac.gypi but for now this creates at
1146 # least a placeholder .zip file. 1147 # least a placeholder .zip file.
1147 inputs = [ 1148 inputs = [
1148 "$root_build_dir/remoting_me2me_host", 1149 # "$root_build_dir/remoting_me2me_host",
1149 ] 1150 ]
1150 output = "$root_build_dir/remoting-me2me-host-mac.zip" 1151 output = "$root_build_dir/remoting-me2me-host-mac.zip"
1151 deps = [ 1152 deps = [
1152 ":remoting_me2me_host", 1153 # ":remoting_me2me_host",
Robert Sesek 2016/06/24 18:40:42 FAILED: remoting_me2me_host remoting_me2me_host.dS
1153 ] 1154 ]
1154 } 1155 }
1155 } else { 1156 } else {
1156 group("remoting_me2me_host_archive") { 1157 group("remoting_me2me_host_archive") {
1157 } 1158 }
1158 } 1159 }
1159 1160
1160 if (is_win && is_chrome_branded) { 1161 if (is_win && is_chrome_branded) {
1161 if (target_cpu == "x86") { 1162 if (target_cpu == "x86") {
1162 # The script uses "ia32" instead of "x86". 1163 # The script uses "ia32" instead of "x86".
(...skipping 18 matching lines...) Expand all
1181 rebase_path("$root_gen_dir/installation", root_build_dir), 1182 rebase_path("$root_gen_dir/installation", root_build_dir),
1182 "--target_arch", 1183 "--target_arch",
1183 msi_script_arch, 1184 msi_script_arch,
1184 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", 1185 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
1185 root_build_dir), 1186 root_build_dir),
1186 rebase_path(outputs[0], root_build_dir), 1187 rebase_path(outputs[0], root_build_dir),
1187 ] 1188 ]
1188 } 1189 }
1189 } 1190 }
1190 } 1191 }
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