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

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

Issue 2411423002: Linux build: Use sysroot when calculating dependencies (Closed)
Patch Set: Merge expected_deps changes into this CL 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
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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 "-o", 276 "-o",
276 rebase_path(root_out_dir, root_build_dir), 277 rebase_path(root_out_dir, root_build_dir),
277 "-b", 278 "-b",
278 rebase_path(root_out_dir, root_build_dir), 279 rebase_path(root_out_dir, root_build_dir),
279 "-a", 280 "-a",
280 build_script_arch, 281 build_script_arch,
281 "-c", 282 "-c",
282 invoker.channel, 283 invoker.channel,
283 "-d", 284 "-d",
284 branding_path_component, 285 branding_path_component,
286 "-s",
287 rebase_path(sysroot),
285 ] 288 ]
286 deps = [ 289 deps = [
287 ":installer_deps", 290 ":installer_deps",
288 ] 291 ]
289 } 292 }
290 293
291 if (!is_chromeos) { 294 if (!is_chromeos) {
292 rpm_target_name = "${target_name}_rpm" 295 rpm_target_name = "${target_name}_rpm"
293 action(rpm_target_name) { 296 action(rpm_target_name) {
294 visibility = [ ":*" ] 297 visibility = [ ":*" ]
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 # Other packages that we support that aren't included in the default "linux" 356 # Other packages that we support that aren't included in the default "linux"
354 # target. 357 # target.
355 linux_package("trunk") { 358 linux_package("trunk") {
356 channel = "trunk" 359 channel = "trunk"
357 } 360 }
358 if (is_asan) { 361 if (is_asan) {
359 linux_package("asan") { 362 linux_package("asan") {
360 channel = "asan" 363 channel = "asan"
361 } 364 }
362 } 365 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/linux/debian/build.sh » ('j') | chrome/installer/linux/debian/build.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698