Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1301)

Unified Diff: build/gn_migration.gypi

Issue 966223002: Fix a build failing in the x86 linux builds ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in gyp condition Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index fccb983469238ea23badcde105be504a881889c2..03998ed36f3fcb6550b185e62b6df63d8e9421b8 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',
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698