Don't cross-compile tools used for creating diff installers.
Diff installer creation runs on the same hosts that the build runs on,
so should create binaries for the same architecture.
BUG=1119472
R=[email protected], [email protected]
(cherry picked from commit 6912cdb0965dc335beed4eb27c41fe8bb58f4184)
Change-Id: I58772ce20b47cf9ce854a095de3aac3cf697d5ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454390
Commit-Queue: Michael Moss <[email protected]>
Auto-Submit: Michael Moss <[email protected]>
Reviewed-by: Mark Mentovai <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#814475}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454931
Reviewed-by: Michael Moss <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#93}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
index 108dd95d..09faabc 100644
--- a/chrome/installer/mac/BUILD.gn
+++ b/chrome/installer/mac/BUILD.gn
@@ -60,19 +60,22 @@
deps = [
":copy_signing",
"//chrome:entitlements",
- "//chrome/installer/mac/third_party/bsdiff:goobsdiff",
+ "//chrome/installer/mac/third_party/bsdiff:goobsdiff($host_toolchain)",
"//chrome/installer/mac/third_party/bsdiff:goobspatch",
"//chrome/installer/mac/third_party/xz:lzma_decompress",
- "//chrome/installer/mac/third_party/xz:xz",
+ "//chrome/installer/mac/third_party/xz:xz($host_toolchain)",
"//chrome/installer/mac/third_party/xz:xzdec",
]
sources = [
"$root_gen_dir/chrome/app-entitlements.plist",
- "$root_out_dir/goobsdiff",
+ get_label_info(
+ "//chrome/installer/mac/third_party/bsdiff:goobsdiff($host_toolchain)",
+ "root_out_dir") + "/goobsdiff",
"$root_out_dir/goobspatch",
"$root_out_dir/liblzma_decompress.dylib",
- "$root_out_dir/xz",
+ get_label_info("//chrome/installer/mac/third_party/xz:xz($host_toolchain)",
+ "root_out_dir") + "/xz",
"$root_out_dir/xzdec",
"//chrome/app/helper-gpu-entitlements.plist",
"//chrome/app/helper-plugin-entitlements.plist",
