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

Side by Side Diff: chrome/installer/linux/BUILD.gn

Issue 2425693003: Revert of Linux build: Use sysroot when calculating dependencies (Closed)
Patch Set: 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")
9 import("//build/util/process_version.gni") 8 import("//build/util/process_version.gni")
10 import("//build/util/version.gni") 9 import("//build/util/version.gni")
11 import("//chrome/process_version_rc_template.gni") # For branding_file_path. 10 import("//chrome/process_version_rc_template.gni") # For branding_file_path.
12 11
13 if (current_cpu == "x86" || current_cpu == "x64") { 12 if (current_cpu == "x86" || current_cpu == "x64") {
14 import("//media/cdm/ppapi/cdm_paths.gni") 13 import("//media/cdm/ppapi/cdm_paths.gni")
15 } 14 }
16 15
17 assert(is_linux) 16 assert(is_linux)
18 17
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ] 100 ]
102 } 101 }
103 102
104 copy("deb_packaging_files") { 103 copy("deb_packaging_files") {
105 visibility = [ ":*" ] 104 visibility = [ ":*" ]
106 sources = [ 105 sources = [
107 "debian/build.sh", 106 "debian/build.sh",
108 "debian/changelog.template", 107 "debian/changelog.template",
109 "debian/control.template", 108 "debian/control.template",
110 "debian/debian.menu", 109 "debian/debian.menu",
111 "debian/expected_deps_ia32_jessie", 110 "debian/expected_deps_ia32_precise",
112 "debian/expected_deps_ia32_wheezy", 111 "debian/expected_deps_ia32_trusty",
113 "debian/expected_deps_x64_jessie", 112 "debian/expected_deps_x64_precise",
114 "debian/expected_deps_x64_wheezy", 113 "debian/expected_deps_x64_trusty",
115 "debian/postinst", 114 "debian/postinst",
116 "debian/postrm", 115 "debian/postrm",
117 "debian/prerm", 116 "debian/prerm",
118 ] 117 ]
119 outputs = [ 118 outputs = [
120 "$root_out_dir/installer/debian/{{source_file_part}}", 119 "$root_out_dir/installer/debian/{{source_file_part}}",
121 ] 120 ]
122 } 121 }
123 122
124 copy("theme_files") { 123 copy("theme_files") {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 "-o", 275 "-o",
277 rebase_path(root_out_dir, root_build_dir), 276 rebase_path(root_out_dir, root_build_dir),
278 "-b", 277 "-b",
279 rebase_path(root_out_dir, root_build_dir), 278 rebase_path(root_out_dir, root_build_dir),
280 "-a", 279 "-a",
281 build_script_arch, 280 build_script_arch,
282 "-c", 281 "-c",
283 invoker.channel, 282 invoker.channel,
284 "-d", 283 "-d",
285 branding_path_component, 284 branding_path_component,
286 "-s",
287 rebase_path(sysroot),
288 "-e",
289 rebase_path("//third_party/dpkg-dev"),
290 ] 285 ]
291 deps = [ 286 deps = [
292 ":installer_deps", 287 ":installer_deps",
293 ] 288 ]
294 } 289 }
295 290
296 if (!is_chromeos) { 291 if (!is_chromeos) {
297 rpm_target_name = "${target_name}_rpm" 292 rpm_target_name = "${target_name}_rpm"
298 action(rpm_target_name) { 293 action(rpm_target_name) {
299 visibility = [ ":*" ] 294 visibility = [ ":*" ]
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 # Other packages that we support that aren't included in the default "linux" 353 # Other packages that we support that aren't included in the default "linux"
359 # target. 354 # target.
360 linux_package("trunk") { 355 linux_package("trunk") {
361 channel = "trunk" 356 channel = "trunk"
362 } 357 }
363 if (is_asan) { 358 if (is_asan) {
364 linux_package("asan") { 359 linux_package("asan") {
365 channel = "asan" 360 channel = "asan"
366 } 361 }
367 } 362 }
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