| 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/util/version.gni") | 8 import("//build/util/version.gni") |
| 9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
| 10 | 10 |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 # and are guaranteed to have been built before those actions run. | 161 # and are guaranteed to have been built before those actions run. |
| 162 | 162 |
| 163 public_deps = [ | 163 public_deps = [ |
| 164 ":common_packaging_files", | 164 ":common_packaging_files", |
| 165 ":deb_packaging_files", | 165 ":deb_packaging_files", |
| 166 ":save_build_info", | 166 ":save_build_info", |
| 167 ":theme_files", | 167 ":theme_files", |
| 168 "//chrome", | 168 "//chrome", |
| 169 "//chrome:packed_resources", | 169 "//chrome:packed_resources", |
| 170 "//sandbox/linux:chrome_sandbox", | 170 "//sandbox/linux:chrome_sandbox", |
| 171 "//third_party/adobe/flash:flapper_binaries", | |
| 172 ] | 171 ] |
| 173 if (enable_nacl) { | 172 if (enable_nacl) { |
| 174 public_deps += [ | 173 public_deps += [ |
| 175 "//components/nacl/loader:nacl_helper", | 174 "//components/nacl/loader:nacl_helper", |
| 176 | 175 |
| 177 # These are data_deps of nacl_helper, but that is not enough, | 176 # These are data_deps of nacl_helper, but that is not enough, |
| 178 # as explained above. | 177 # as explained above. |
| 179 "//native_client/src/trusted/service_runtime/linux:bootstrap", | 178 "//native_client/src/trusted/service_runtime/linux:bootstrap", |
| 180 "//ppapi/native_client:irt", | 179 "//ppapi/native_client:irt", |
| 181 ] | 180 ] |
| (...skipping 28 matching lines...) Expand all Loading... |
| 210 # TODO(mmoss) Any convenient way to get all the relevant build | 209 # TODO(mmoss) Any convenient way to get all the relevant build |
| 211 # files? (e.g. all locales, resources, etc.) | 210 # files? (e.g. all locales, resources, etc.) |
| 212 "$root_out_dir/chrome", | 211 "$root_out_dir/chrome", |
| 213 "$root_out_dir/chrome_sandbox", | 212 "$root_out_dir/chrome_sandbox", |
| 214 "$root_out_dir/xdg-mime", | 213 "$root_out_dir/xdg-mime", |
| 215 "$root_out_dir/xdg-settings", | 214 "$root_out_dir/xdg-settings", |
| 216 "$root_out_dir/locales/en-US.pak", | 215 "$root_out_dir/locales/en-US.pak", |
| 217 | 216 |
| 218 "$root_out_dir/nacl_helper", | 217 "$root_out_dir/nacl_helper", |
| 219 "$root_out_dir/nacl_helper_bootstrap", | 218 "$root_out_dir/nacl_helper_bootstrap", |
| 220 "$root_out_dir/PepperFlash/libpepflashplayer.so", | |
| 221 "$root_out_dir/PepperFlash/manifest.json", | |
| 222 ] | 219 ] |
| 223 | 220 |
| 224 if (current_cpu == "x86") { | 221 if (current_cpu == "x86") { |
| 225 packaging_files_binaries += [ | 222 packaging_files_binaries += [ |
| 226 "$root_out_dir/nacl_irt_x86_32.nexe", | 223 "$root_out_dir/nacl_irt_x86_32.nexe", |
| 227 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so", | 224 "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so", |
| 228 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", | 225 "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", |
| 229 ] | 226 ] |
| 230 } else if (current_cpu == "x64") { | 227 } else if (current_cpu == "x64") { |
| 231 packaging_files_binaries += [ | 228 packaging_files_binaries += [ |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 # Other packages that we support that aren't included in the default "linux" | 341 # Other packages that we support that aren't included in the default "linux" |
| 345 # target. | 342 # target. |
| 346 linux_package("trunk") { | 343 linux_package("trunk") { |
| 347 channel = "trunk" | 344 channel = "trunk" |
| 348 } | 345 } |
| 349 if (is_asan) { | 346 if (is_asan) { |
| 350 linux_package("asan") { | 347 linux_package("asan") { |
| 351 channel = "asan" | 348 channel = "asan" |
| 352 } | 349 } |
| 353 } | 350 } |
| OLD | NEW |