diff options
author | dbeam <dbeam@chromium.org> | 2016-01-04 14:52:54 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 22:53:54 +0000 |
commit | 65423bc9e6cb679ada9d00d0f41d3ee2d46ffc7c (patch) | |
tree | b7b6505435a98845d5a6001b3cb7f8d3aff2482c /extensions/shell | |
parent | 095ae4715bb677011e020a52062903162eb12f20 (diff) | |
download | chromium_src-65423bc9e6cb679ada9d00d0f41d3ee2d46ffc7c.zip chromium_src-65423bc9e6cb679ada9d00d0f41d3ee2d46ffc7c.tar.gz chromium_src-65423bc9e6cb679ada9d00d0f41d3ee2d46ffc7c.tar.bz2 |
Revert of GN: Properly mark all NaCl test depencies as data_deps (patchset #2 id:20001 of https://codereview.chromium.org/1547463004/ )
Reason for revert:
broke windows GN build:
https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN/builds/9754/steps/generate_build_files/logs/stdio
E:\b\build\slave\Win_x64_GN\build\src\buildtools\win\gn gen //out/Release_x64 "--args=is_debug=false is_component_build=false use_goma=true goma_dir=\"E:\b\build\goma\" symbol_level=1" --check
-> returned 1
ERROR Input to target not generated by a dependency.
The file:
//out/Release_x64/nacl_irt_x86_64.nexe
is listed as an input or source for the target:
//chrome/installer/mini_installer:archive(//build/toolchain/win:x64)
but this file was not generated by any dependencies of the target. The target
that generates the file is:
//ppapi/native_client:nacl_irt_debuglink(//build/toolchain/nacl:irt_x64)
Original issue's description:
> GN: Properly mark all NaCl test depencies as data_deps
>
> NaCl tests and helpers are build as standalone executables and
> hence need to be marked as data_deps to be copied over to shards.
>
> BUG=462791
>
> Committed: https://crrev.com/21255d8b9b0ace0629fd941ee128cf9adf356b31
> Cr-Commit-Position: refs/heads/master@{#367367}
TBR=brettw@chromium.org,bradnelson@chromium.org,phosek@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462791
Review URL: https://codereview.chromium.org/1555223002
Cr-Commit-Position: refs/heads/master@{#367396}
Diffstat (limited to 'extensions/shell')
-rw-r--r-- | extensions/shell/BUILD.gn | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 8cb0dd3..0f8af6e 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -104,10 +104,7 @@ source_set("app_shell_lib") { ] if (is_linux) { - deps += [ - "//components/nacl/loader:helper_nonsfi", - "//components/nacl/loader:nacl_helper", - ] + deps += [ "//components/nacl/loader:nacl_helper" ] } } |