diff options
| author | dpranke <dpranke@chromium.org> | 2015-03-01 11:07:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-01 19:08:01 +0000 |
| commit | 425ba073036f96f04aea09c9836826ccb2e124e4 (patch) | |
| tree | fc9c0547047b82dbcb0d8ea4c2860c373a0cec52 /build | |
| parent | 267d01132405cdfa814029fbbdf08a3269f5aaf8 (diff) | |
| download | chromium_src-425ba073036f96f04aea09c9836826ccb2e124e4.zip chromium_src-425ba073036f96f04aea09c9836826ccb2e124e4.tar.gz chromium_src-425ba073036f96f04aea09c9836826ccb2e124e4.tar.bz2 | |
Fix a build failing in the x86 linux builds ...
If NaCl is disabled, we get a build failure in the
x86 Linux builds when trying to build monacl_shell
(which isn't defined).
This patch fixes the issue by not trying to include
the gn_migration targets *and* by not trying to
build monacl_shell when nacl is disabled, both of
which were wrong.
Also, this patch fixes an issue in 'analyze' where it
was trying to analyze build_utf8_validator_tables
and not #host.
TBR=brettw@chromium.org
BUG=462945, 461019
Review URL: https://codereview.chromium.org/966223002
Cr-Commit-Position: refs/heads/master@{#318626}
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index f421b46..9c1fab2 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -468,7 +468,7 @@ ], 'conditions': [ # TODO(GYP): make gn_migration.gypi work unconditionally. - ['OS=="linux" and chromeos==0', { + ['OS=="linux" and target_arch=="x64" and chromeos==0', { 'includes': [ 'gn_migration.gypi', ], diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index fccb983..03998ed 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -352,7 +352,7 @@ 'dependencies': [ '../base/base.gyp:base_i18n_perftests', '../base/base.gyp:base_perftests', - '../base/base.gyp:build_utf8_validator_tables', + '../base/base.gyp:build_utf8_validator_tables#host', '../base/base.gyp:check_example', '../base/base.gyp:protect_file_posix', '../breakpad/breakpad.gyp:core-2-minidump', @@ -393,7 +393,6 @@ '../media/cast/cast.gyp:tap_proxy', '../media/media.gyp:player_x11', '../mojo/mojo_base.gyp:mojo_application_chromium', - '../mojo/mojo_nacl.gyp:monacl_shell', '../net/net.gyp:hpack_example_generator', '../net/net.gyp:hpack_fuzz_mutator', '../net/net.gyp:hpack_fuzz_wrapper', @@ -437,6 +436,11 @@ '../ppapi/ppapi_internal.gyp:*', ], 'conditions': [ + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'dependencies': [ + '../mojo/mojo_nacl.gyp:monacl_shell', + ] + }], ['test_isolation_mode!="noop"', { 'dependencies': [ '../ash/ash.gyp:ash_unittests_run', |