diff options
| author | brettw <brettw@chromium.org> | 2015-10-23 16:06:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 23:07:31 +0000 |
| commit | e1d4065ee1d16e56d5b3267bfb643615454e9ba7 (patch) | |
| tree | 0f15c7a04a7b1496ef7dfb85c25dd8c6f830e5f1 /extensions/shell | |
| parent | ddbd6739dd693adbc85ecc5bafd400a6f59c3900 (diff) | |
| download | chromium_src-e1d4065ee1d16e56d5b3267bfb643615454e9ba7.zip chromium_src-e1d4065ee1d16e56d5b3267bfb643615454e9ba7.tar.gz chromium_src-e1d4065ee1d16e56d5b3267bfb643615454e9ba7.tar.bz2 | |
Make chrome and other targets compile on Mac GN
The other targets include browser_tests, interactive_ui_tests, sync_integration_tests, extensions_browsertests, content_shell, app_shell.
These targets don't actually run because bundles aren't supported yet.
Review URL: https://codereview.chromium.org/1413783003
Cr-Commit-Position: refs/heads/master@{#355917}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/BUILD.gn | 23 | ||||
| -rw-r--r-- | extensions/shell/app_shell.gyp | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 06bf717..0e31897 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -156,7 +156,12 @@ if (!(is_chromeos && !use_ozone)) { } if (is_mac) { - # TODO(GYP): Mac bundling + # TODO(GYP) bug 546894: Fix GN and toolchains to handle spaces here. + #output_name = "App Shell" + # TODO(GYP): Mac bundling. See also content_shell which this is basically + # a copy-paste of. + deps += [ ":app_shell_framework" ] + # TODO(GYP): Mac app_shell_helper stuff. } } } @@ -238,3 +243,19 @@ process_version("version_header") { template_file = "common/version.h.in" output = "$target_gen_dir/common/version.h" } + +if (is_mac) { + # TODO(GYP) this should be a bundle. Lots of other stuff in this target. + # Should be able to copy content shell framework (this is basically a + # copy-paste of that target). + shared_library("app_shell_framework") { + testonly = true + sources = [ + "app/shell_main_mac.cc", + "app/shell_main_mac.h", + ] + deps = [ + ":app_shell_lib", + ] + } +} diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index 0ad524c..7184266 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -16,6 +16,7 @@ }, 'targets': [ { + # GN version: //extensions/shell:app_shell_lib 'target_name': 'app_shell_lib', 'type': 'static_library', 'dependencies': [ @@ -107,6 +108,7 @@ ], }, { + # GN version: //extensions/shell:app_shell 'target_name': 'app_shell', 'type': 'executable', 'mac_bundle': 1, @@ -271,6 +273,7 @@ ['OS=="mac"', { 'targets': [ { + # GN version: //extensions/shell:app_shell_framework 'target_name': 'app_shell_framework', 'type': 'shared_library', 'product_name': '<(app_shell_product_name) Framework', |