| 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/util/version.gni") | 7 import("//build/util/version.gni") |
| 7 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
| 8 | 9 |
| 9 assert(is_linux && is_chrome_branded) | 10 assert(is_linux && is_chrome_branded) |
| 10 | 11 |
| 11 # This target builds all "normal" Linux installers. | 12 # This target builds all "normal" Linux installers. |
| 12 # GYP version: chrome/chrome_installer.gypi:linux_packages_all | 13 # GYP version: chrome/chrome_installer.gypi:linux_packages_all |
| 13 # | 14 # |
| 14 # The bot setup is to build stable, unstable, and beta packages for the current | 15 # The bot setup is to build stable, unstable, and beta packages for the current |
| 15 # build. Then a later step picks up the package corresponding to what the | 16 # build. Then a later step picks up the package corresponding to what the |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 138 |
| 138 # Dependencies for all Linux installer targets. | 139 # Dependencies for all Linux installer targets. |
| 139 group("installer_deps") { | 140 group("installer_deps") { |
| 140 public_deps = [ | 141 public_deps = [ |
| 141 ":common_packaging_files", | 142 ":common_packaging_files", |
| 142 ":deb_packaging_files", | 143 ":deb_packaging_files", |
| 143 ":save_build_info", | 144 ":save_build_info", |
| 144 ":theme_files", | 145 ":theme_files", |
| 145 "//chrome", | 146 "//chrome", |
| 146 "//chrome:packed_resources", | 147 "//chrome:packed_resources", |
| 147 "//components/nacl:nacl_helper", | |
| 148 "//sandbox/linux:chrome_sandbox", | 148 "//sandbox/linux:chrome_sandbox", |
| 149 "//third_party/adobe/flash:flapper_binaries", | 149 "//third_party/adobe/flash:flapper_binaries", |
| 150 ] | 150 ] |
| 151 if (enable_nacl) { |
| 152 public_deps += [ "//components/nacl:nacl_helper" ] |
| 153 } |
| 151 if (current_cpu == "x86" || current_cpu == "x64") { | 154 if (current_cpu == "x86" || current_cpu == "x64") { |
| 152 public_deps += [ | 155 public_deps += [ |
| 153 "//third_party/widevine/cdm:widevinecdm", | 156 "//third_party/widevine/cdm:widevinecdm", |
| 154 "//third_party/widevine/cdm:widevinecdmadapter", | 157 "//third_party/widevine/cdm:widevinecdmadapter", |
| 155 ] | 158 ] |
| 156 } | 159 } |
| 157 if (!is_chromeos) { | 160 if (!is_chromeos) { |
| 158 public_deps += [ ":rpm_packaging_files" ] | 161 public_deps += [ ":rpm_packaging_files" ] |
| 159 } | 162 } |
| 160 } | 163 } |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 # Other packages that we support that aren't included in the default "linux" | 313 # Other packages that we support that aren't included in the default "linux" |
| 311 # target. | 314 # target. |
| 312 linux_package("trunk") { | 315 linux_package("trunk") { |
| 313 channel = "trunk" | 316 channel = "trunk" |
| 314 } | 317 } |
| 315 if (is_asan) { | 318 if (is_asan) { |
| 316 linux_package("asan") { | 319 linux_package("asan") { |
| 317 channel = "asan" | 320 channel = "asan" |
| 318 } | 321 } |
| 319 } | 322 } |
| OLD | NEW |