OLD | NEW |
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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 "-o", | 274 "-o", |
274 rebase_path(root_out_dir, root_build_dir), | 275 rebase_path(root_out_dir, root_build_dir), |
275 "-b", | 276 "-b", |
276 rebase_path(root_out_dir, root_build_dir), | 277 rebase_path(root_out_dir, root_build_dir), |
277 "-a", | 278 "-a", |
278 build_script_arch, | 279 build_script_arch, |
279 "-c", | 280 "-c", |
280 invoker.channel, | 281 invoker.channel, |
281 "-d", | 282 "-d", |
282 branding_path_component, | 283 branding_path_component, |
| 284 "-s", |
| 285 rebase_path(sysroot), |
283 ] | 286 ] |
284 deps = [ | 287 deps = [ |
285 ":installer_deps", | 288 ":installer_deps", |
286 ] | 289 ] |
287 } | 290 } |
288 | 291 |
289 if (!is_chromeos) { | 292 if (!is_chromeos) { |
290 rpm_target_name = "${target_name}_rpm" | 293 rpm_target_name = "${target_name}_rpm" |
291 action(rpm_target_name) { | 294 action(rpm_target_name) { |
292 visibility = [ ":*" ] | 295 visibility = [ ":*" ] |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 # Other packages that we support that aren't included in the default "linux" | 354 # Other packages that we support that aren't included in the default "linux" |
352 # target. | 355 # target. |
353 linux_package("trunk") { | 356 linux_package("trunk") { |
354 channel = "trunk" | 357 channel = "trunk" |
355 } | 358 } |
356 if (is_asan) { | 359 if (is_asan) { |
357 linux_package("asan") { | 360 linux_package("asan") { |
358 channel = "asan" | 361 channel = "asan" |
359 } | 362 } |
360 } | 363 } |
OLD | NEW |