diff options
| author | brettw <brettw@chromium.org> | 2015-12-14 18:57:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-15 02:58:39 +0000 |
| commit | 263435ba08cd291d9a0534719a599ad11098090a (patch) | |
| tree | 24bfae36199f42d27d9eec5b0cf63b912869730e /extensions/shell | |
| parent | 3582bd764b1b26a70d765b8b744bc619b4bfc4e1 (diff) | |
| download | chromium_src-263435ba08cd291d9a0534719a599ad11098090a.zip chromium_src-263435ba08cd291d9a0534719a599ad11098090a.tar.gz chromium_src-263435ba08cd291d9a0534719a599ad11098090a.tar.bz2 | |
Move nacl targets to subdirectories.
This clarifies the structure a bit and is the format recommended by GN style.
Adds annotations to the GYP files for the corresponding GN targets. Removes some dead code in extensions/shell.
R=dpranke@chromium.org
Review URL: https://codereview.chromium.org/1523503002
Cr-Commit-Position: refs/heads/master@{#365139}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/BUILD.gn | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 829ef00..0f8af6e 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -89,28 +89,6 @@ source_set("app_shell_lib") { sources += chromeos_sources } - # TODO(GYP): Enable this when //components/nacl GN is done. See - # http://crbug.com/430602 - if (false) { - if (enable_nacl) { - if (is_linux) { - deps += [ "//components/nacl:nacl_helper" ] - } - deps += [ - "//components/nacl", - "//components/nacl:browser", - "//components/nacl:common", - "//components/nacl:renderer", - "//components/nacl:switches", - ] - nacl_sources = - rebase_path(app_shell_gypi_values.app_shell_lib_sources_nacl, - ".", - "//extensions/shell") - sources += nacl_sources - } - } - if (enable_nacl) { sources += [ "browser/shell_nacl_browser_delegate.cc", @@ -118,16 +96,15 @@ source_set("app_shell_lib") { ] deps += [ - "//components/nacl", - "//components/nacl:nacl_browser", - "//components/nacl:nacl_common", - "//components/nacl:nacl_renderer", - "//components/nacl:nacl_switches", + "//components/nacl/browser", + "//components/nacl/common", + "//components/nacl/loader", + "//components/nacl/renderer", "//components/nacl/renderer/plugin:nacl_trusted_plugin", ] if (is_linux) { - deps += [ "//components/nacl:nacl_helper" ] + deps += [ "//components/nacl/loader:nacl_helper" ] } } |