diff options
| author | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 07:33:00 +0000 |
|---|---|---|
| committer | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 07:33:00 +0000 |
| commit | 1114aeee1a34b006a488c3de214388b6c31425a6 (patch) | |
| tree | c6894c77c94676b5f32e87bbdfeaaf503101e190 /build | |
| parent | 210a822b6bcfb512188da2bdde943f0e0624bde2 (diff) | |
| download | chromium_src-1114aeee1a34b006a488c3de214388b6c31425a6.zip chromium_src-1114aeee1a34b006a488c3de214388b6c31425a6.tar.gz chromium_src-1114aeee1a34b006a488c3de214388b6c31425a6.tar.bz2 | |
Add nacl_loader_unittests to the chromium_builder_tests
Now nacl_loader target is built on all platforms. Also,
nacl_loader target was renamed to nacl_linux.
TEST=ninja -C out/Release chromium_builder_tests
TEST=GYP_DEFINES='disable_nacl=1' ./build/gyp_chromium \
ninja -C out/Release chromium_builder_tests
TEST=trybots
BUG=364751
R=mseaborn@chromium.org
Review URL: https://codereview.chromium.org/260063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index 994d5cb..ce3a249 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -385,6 +385,11 @@ '../ash/ash.gyp:ash_unittests', ], }], + ['disable_nacl==0', { + 'dependencies': [ + '../components/nacl.gyp:nacl_loader_unittests', + ], + }], ], }, # target_name: chromium_builder_tests { |