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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 import("//build/config/sysroot.gni")
8 import("//build/util/process_version.gni") 9 import("//build/util/process_version.gni")
9 import("//build/util/version.gni") 10 import("//build/util/version.gni")
10 import("//chrome/process_version_rc_template.gni") # For branding_file_path. 11 import("//chrome/process_version_rc_template.gni") # For branding_file_path.
11 12
12 if (current_cpu == "x86" || current_cpu == "x64") { 13 if (current_cpu == "x86" || current_cpu == "x64") {
13 import("//media/cdm/ppapi/cdm_paths.gni") 14 import("//media/cdm/ppapi/cdm_paths.gni")
14 } 15 }
15 16
16 assert(is_linux) 17 assert(is_linux)
17 18
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ] 101 ]
101 } 102 }
102 103
103 copy("deb_packaging_files") { 104 copy("deb_packaging_files") {
104 visibility = [ ":*" ] 105 visibility = [ ":*" ]
105 sources = [ 106 sources = [
106 "debian/build.sh", 107 "debian/build.sh",
107 "debian/changelog.template", 108 "debian/changelog.template",
108 "debian/control.template", 109 "debian/control.template",
109 "debian/debian.menu", 110 "debian/debian.menu",
110 "debian/expected_deps_ia32_precise", 111 "debian/expected_deps_ia32_jessie",
111 "debian/expected_deps_ia32_trusty", 112 "debian/expected_deps_ia32_wheezy",
112 "debian/expected_deps_x64_precise", 113 "debian/expected_deps_x64_jessie",
113 "debian/expected_deps_x64_trusty", 114 "debian/expected_deps_x64_wheezy",
114 "debian/postinst", 115 "debian/postinst",
115 "debian/postrm", 116 "debian/postrm",
116 "debian/prerm", 117 "debian/prerm",
117 ] 118 ]
118 outputs = [ 119 outputs = [
119 "$root_out_dir/installer/debian/{{source_file_part}}", 120 "$root_out_dir/installer/debian/{{source_file_part}}",
120 ] 121 ]
121 } 122 }
122 123
123 copy("theme_files") { 124 copy("theme_files") {
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 "-o", 277 "-o",
277 rebase_path(root_out_dir, root_build_dir), 278 rebase_path(root_out_dir, root_build_dir),
278 "-b", 279 "-b",
279 rebase_path(root_out_dir, root_build_dir), 280 rebase_path(root_out_dir, root_build_dir),
280 "-a", 281 "-a",
281 build_script_arch, 282 build_script_arch,
282 "-c", 283 "-c",
283 invoker.channel, 284 invoker.channel,
284 "-d", 285 "-d",
285 branding_path_component, 286 branding_path_component,
287 "-s",
288 rebase_path(sysroot),
289 "-e",
290 rebase_path("//third_party/dpkg-dev"),
286 ] 291 ]
287 deps = [ 292 deps = [
288 ":installer_deps", 293 ":installer_deps",
289 ] 294 ]
290 } 295 }
291 296
292 if (!is_chromeos) { 297 if (!is_chromeos) {
293 rpm_target_name = "${target_name}_rpm" 298 rpm_target_name = "${target_name}_rpm"
294 action(rpm_target_name) { 299 action(rpm_target_name) {
295 visibility = [ ":*" ] 300 visibility = [ ":*" ]
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 # Other packages that we support that aren't included in the default "linux" 359 # Other packages that we support that aren't included in the default "linux"
355 # target. 360 # target.
356 linux_package("trunk") { 361 linux_package("trunk") {
357 channel = "trunk" 362 channel = "trunk"
358 } 363 }
359 if (is_asan) { 364 if (is_asan) {
360 linux_package("asan") { 365 linux_package("asan") {
361 channel = "asan" 366 channel = "asan"
362 } 367 }
363 } 368 }
OLDNEW
« 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