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/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
8 import("//build/config/win/console_app.gni") | 8 import("//build/config/win/console_app.gni") |
9 import("//build/config/win/manifest.gni") | 9 import("//build/config/win/manifest.gni") |
10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
455 ] | 455 ] |
456 } | 456 } |
457 | 457 |
458 if (is_android) { | 458 if (is_android) { |
459 # Some tests rely on this tool. It might be nicer if these tests relied on | 459 # Some tests rely on this tool. It might be nicer if these tests relied on |
460 # image diff rather than having content shell depend on it. | 460 # image diff rather than having content shell depend on it. |
461 data_deps = [ | 461 data_deps = [ |
462 "//tools/imagediff($host_toolchain)", | 462 "//tools/imagediff($host_toolchain)", |
463 ] | 463 ] |
464 } | 464 } |
465 | |
466 if (is_linux && !is_component_build) { | |
467 # Set rpath to find our own libfreetype even in a non-component build. | |
468 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] | |
469 } | |
Dirk Pranke
2016/03/10 01:37:12
This is basically the right fix, but I think it mi
Mike West
2016/03/10 08:46:46
I'd be fine with that.
Xianzhu
2016/03/10 17:31:26
I think the current method is better because:
- It
| |
465 } | 470 } |
466 } else { | 471 } else { |
467 group("content_shell") { | 472 group("content_shell") { |
468 testonly = true | 473 testonly = true |
469 deps = [ | 474 deps = [ |
470 ":content_shell_lib", | 475 ":content_shell_lib", |
471 ] | 476 ] |
472 } | 477 } |
473 } | 478 } |
474 | 479 |
(...skipping 28 matching lines...) Expand all Loading... | |
503 sources = [ | 508 sources = [ |
504 "app/shell_content_main.cc", | 509 "app/shell_content_main.cc", |
505 "app/shell_content_main.h", | 510 "app/shell_content_main.h", |
506 ] | 511 ] |
507 | 512 |
508 deps = [ | 513 deps = [ |
509 ":content_shell_lib", | 514 ":content_shell_lib", |
510 ] | 515 ] |
511 } | 516 } |
512 } | 517 } |
OLD | NEW |