| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/nacl/config.gni") | 6 import("//build/config/nacl/config.gni") |
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 | 8 |
| 9 if (is_android) { | 9 if (is_android) { |
| 10 import("//build/config/android/rules.gni") | 10 import("//build/config/android/rules.gni") |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 306 |
| 307 import("//build/config/compiler/compiler.gni") | 307 import("//build/config/compiler/compiler.gni") |
| 308 import("//build/config/sanitizers/sanitizers.gni") | 308 import("//build/config/sanitizers/sanitizers.gni") |
| 309 if (is_component_build && !using_sanitizer) { | 309 if (is_component_build && !using_sanitizer) { |
| 310 # WARNING! We remove this config so that we don't accidentally | 310 # WARNING! We remove this config so that we don't accidentally |
| 311 # pick up the //build/config:rpath_for_built_shared_libraries | 311 # pick up the //build/config:rpath_for_built_shared_libraries |
| 312 # sub-config. However, this means that we need to duplicate any | 312 # sub-config. However, this means that we need to duplicate any |
| 313 # other flags that executable_config might have. | 313 # other flags that executable_config might have. |
| 314 configs -= [ "//build/config:executable_config" ] | 314 configs -= [ "//build/config:executable_config" ] |
| 315 if (!use_gold) { | 315 if (!use_gold) { |
| 316 ldflags += [ "-Wl,--disable-new-dtags" ] | 316 ldflags = [ "-Wl,--disable-new-dtags" ] |
| 317 } | 317 } |
| 318 } | 318 } |
| 319 | 319 |
| 320 deps = [ | 320 deps = [ |
| 321 "//build/config/sanitizers:deps", | 321 "//build/config/sanitizers:deps", |
| 322 ] | 322 ] |
| 323 } | 323 } |
| 324 } | 324 } |
| 325 | 325 |
| 326 component("sandbox_services") { | 326 component("sandbox_services") { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 | 449 |
| 450 if (is_android) { | 450 if (is_android) { |
| 451 # TODO(GYP_GONE) Delete this after we've converted everything to GN. | 451 # TODO(GYP_GONE) Delete this after we've converted everything to GN. |
| 452 group("sandbox_linux_unittests_deps") { | 452 group("sandbox_linux_unittests_deps") { |
| 453 testonly = true | 453 testonly = true |
| 454 deps = [ | 454 deps = [ |
| 455 ":sandbox_linux_unittests", | 455 ":sandbox_linux_unittests", |
| 456 ] | 456 ] |
| 457 } | 457 } |
| 458 } | 458 } |
| OLD | NEW |