Chromium Code Reviews| 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 ":deb_packaging_files", | 161 ":deb_packaging_files", |
| 162 ":save_build_info", | 162 ":save_build_info", |
| 163 ":theme_files", | 163 ":theme_files", |
| 164 "//chrome", | 164 "//chrome", |
| 165 "//chrome:packed_resources", | 165 "//chrome:packed_resources", |
| 166 "//sandbox/linux:chrome_sandbox", | 166 "//sandbox/linux:chrome_sandbox", |
| 167 "//third_party/adobe/flash:flapper_binaries", | 167 "//third_party/adobe/flash:flapper_binaries", |
| 168 ] | 168 ] |
| 169 if (enable_nacl) { | 169 if (enable_nacl) { |
| 170 public_deps += [ | 170 public_deps += [ |
| 171 "//components/nacl/loader:helper_nonsfi", | |
|
brettw
2015/12/22 06:53:37
Are you sure this is right? I didn't think nonsfi
Petr Hosek
2015/12/22 06:55:31
You're right, this one is incorrect.
Petr Hosek
2015/12/22 07:12:59
Done.
| |
| 171 "//components/nacl/loader:nacl_helper", | 172 "//components/nacl/loader:nacl_helper", |
| 172 | 173 |
| 173 # These are data_deps of nacl_helper, but that is not enough, | 174 # These are data_deps of nacl_helper, but that is not enough, |
| 174 # as explained above. | 175 # as explained above. |
| 175 "//native_client/src/trusted/service_runtime/linux:bootstrap", | 176 "//native_client/src/trusted/service_runtime/linux:bootstrap", |
| 176 "//ppapi/native_client:irt", | 177 "//ppapi/native_client:irt", |
| 177 ] | 178 ] |
| 178 } | 179 } |
| 179 if (current_cpu == "x86" || current_cpu == "x64") { | 180 if (current_cpu == "x86" || current_cpu == "x64") { |
| 180 public_deps += [ | 181 public_deps += [ |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 340 # 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" |
| 341 # target. | 342 # target. |
| 342 linux_package("trunk") { | 343 linux_package("trunk") { |
| 343 channel = "trunk" | 344 channel = "trunk" |
| 344 } | 345 } |
| 345 if (is_asan) { | 346 if (is_asan) { |
| 346 linux_package("asan") { | 347 linux_package("asan") { |
| 347 channel = "asan" | 348 channel = "asan" |
| 348 } | 349 } |
| 349 } | 350 } |
| OLD | NEW |