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

Unified Diff: chrome/installer/linux/BUILD.gn

Issue 2411423002: Linux build: Use sysroot when calculating dependencies (Closed)
Patch Set: Update expected_deps Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/linux/BUILD.gn
diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
index 1394af3a9669a5282951fd57bc1340eacc2e48b5..c9e0e78ea905622c25efb2c9cc8ee84a9693e9ed 100644
--- a/chrome/installer/linux/BUILD.gn
+++ b/chrome/installer/linux/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
+import("//build/config/sysroot.gni")
import("//build/util/process_version.gni")
import("//build/util/version.gni")
import("//chrome/process_version_rc_template.gni") # For branding_file_path.
@@ -107,10 +108,10 @@ copy("deb_packaging_files") {
"debian/changelog.template",
"debian/control.template",
"debian/debian.menu",
- "debian/expected_deps_ia32_precise",
- "debian/expected_deps_ia32_trusty",
- "debian/expected_deps_x64_precise",
- "debian/expected_deps_x64_trusty",
+ "debian/expected_deps_ia32_jessie",
+ "debian/expected_deps_ia32_wheezy",
+ "debian/expected_deps_x64_jessie",
+ "debian/expected_deps_x64_wheezy",
"debian/postinst",
"debian/postrm",
"debian/prerm",
@@ -283,6 +284,10 @@ template("linux_package") {
invoker.channel,
"-d",
branding_path_component,
+ "-s",
+ rebase_path(sysroot),
+ "-e",
+ rebase_path("//third_party/dpkg-dev"),
]
deps = [
":installer_deps",
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698