| 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 ldflags = [ | 478 ldflags = [ |
| 479 # The main app is at Content Shell.app/Contents/MacOS/Content Shell | 479 # The main app is at Content Shell.app/Contents/MacOS/Content Shell |
| 480 # so set the rpath up to Contents/ so that the loader can find | 480 # so set the rpath up to Contents/ so that the loader can find |
| 481 # Framworks/. | 481 # Framworks/. |
| 482 "-rpath", | 482 "-rpath", |
| 483 "@executable_path/../", | 483 "@executable_path/../", |
| 484 ] | 484 ] |
| 485 info_plist_target = ":content_shell_plist" | 485 info_plist_target = ":content_shell_plist" |
| 486 } | 486 } |
| 487 } else { | 487 } else { |
| 488 # TODO(brettw) when GYP is no longer necessary, delete | |
| 489 # content/shell/app/shell.exe.manifest. This file is not used in GN. | |
| 490 executable("content_shell") { | 488 executable("content_shell") { |
| 491 testonly = true | 489 testonly = true |
| 492 | 490 |
| 493 # TODO(GYP) mac resource bundle stuff for this target. | 491 # TODO(GYP) mac resource bundle stuff for this target. |
| 494 sources = [ | 492 sources = [ |
| 495 "app/shell_main.cc", | 493 "app/shell_main.cc", |
| 496 ] | 494 ] |
| 497 | 495 |
| 498 if (is_win) { | 496 if (is_win) { |
| 499 sources += [ "app/shell.rc" ] | 497 sources += [ "app/shell.rc" ] |
| (...skipping 25 matching lines...) Expand all Loading... |
| 525 } | 523 } |
| 526 | 524 |
| 527 if (is_linux && !is_component_build) { | 525 if (is_linux && !is_component_build) { |
| 528 # Set rpath to find our own libfreetype even in a non-component build. | 526 # Set rpath to find our own libfreetype even in a non-component build. |
| 529 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] | 527 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] |
| 530 } | 528 } |
| 531 } | 529 } |
| 532 } | 530 } |
| 533 | 531 |
| 534 if (is_win) { | 532 if (is_win) { |
| 535 # GYP version: content/content_shell_and_tests.gyp:content_shell_crash_service | |
| 536 executable("content_shell_crash_service") { | 533 executable("content_shell_crash_service") { |
| 537 sources = [ | 534 sources = [ |
| 538 "tools/content_shell_crash_service.cc", | 535 "tools/content_shell_crash_service.cc", |
| 539 ] | 536 ] |
| 540 | 537 |
| 541 deps = [ | 538 deps = [ |
| 542 "//base", | 539 "//base", |
| 543 "//build/config/sanitizers:deps", | 540 "//build/config/sanitizers:deps", |
| 544 "//build/win:default_exe_manifest", | 541 "//build/win:default_exe_manifest", |
| 545 "//components/crash/content/tools:crash_service", | 542 "//components/crash/content/tools:crash_service", |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 "{{bundle_resources_dir}}/{{source_file_part}}", | 739 "{{bundle_resources_dir}}/{{source_file_part}}", |
| 743 ] | 740 ] |
| 744 } | 741 } |
| 745 } | 742 } |
| 746 | 743 |
| 747 mojom("mojo_bindings") { | 744 mojom("mojo_bindings") { |
| 748 sources = [ | 745 sources = [ |
| 749 "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom", | 746 "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom", |
| 750 ] | 747 ] |
| 751 } | 748 } |
| OLD | NEW |