From 27dfb9454752b9a1457b82c0d7ebd88b22ba0e95 Mon Sep 17 00:00:00 2001 From: yoichio Date: Mon, 14 Dec 2015 20:17:33 -0800 Subject: Revert of Move nacl targets to subdirectories. (patchset #6 id:100001 of https://codereview.chromium.org/1523503002/ ) Reason for revert: This might cause errors in the generate_build_files step. https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/6471 Original issue's description: > 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 > > Committed: https://crrev.com/263435ba08cd291d9a0534719a599ad11098090a > Cr-Commit-Position: refs/heads/master@{#365139} TBR=dpranke@chromium.org,mcgrathr@chromium.org,phosek@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1522173003 Cr-Commit-Position: refs/heads/master@{#365146} --- extensions/shell/BUILD.gn | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'extensions/shell') diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 0f8af6e..829ef00 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -89,6 +89,28 @@ 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", @@ -96,15 +118,16 @@ source_set("app_shell_lib") { ] deps += [ - "//components/nacl/browser", - "//components/nacl/common", - "//components/nacl/loader", - "//components/nacl/renderer", + "//components/nacl", + "//components/nacl:nacl_browser", + "//components/nacl:nacl_common", + "//components/nacl:nacl_renderer", + "//components/nacl:nacl_switches", "//components/nacl/renderer/plugin:nacl_trusted_plugin", ] if (is_linux) { - deps += [ "//components/nacl/loader:nacl_helper" ] + deps += [ "//components/nacl:nacl_helper" ] } } -- cgit v1.1