Fix a build failing in the x86 linux builds ...

build/gn_migration.gypi

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file defines three targets that we are using to
 # track the progress of the GYP->GN migration:
 #
 # If you run 'ninja gn_build gyp_remaining gyp_groups', and then
 # run 'ninja', the second ninja invocation should do nothing. This
 # indicates that everything built by a ninja build is in fact
@@ skipping 334 matching lines @@
       'target_name': 'gyp_remaining',
       'type': 'none',
       'dependencies': [
         ':add_to_gn_all',
       ],
       'conditions': [
         ['OS=="linux"', {
           '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',
             '../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
             '../chrome/chrome.gyp:chrome_app_unittests',
             '../chrome/chrome.gyp:chromedriver',
             '../chrome/chrome.gyp:chromedriver_tests',
             '../chrome/chrome.gyp:chromedriver_unittests',
             '../chrome/chrome.gyp:load_library_perf_tests',
             '../chrome/chrome.gyp:performance_browser_tests',
@@ skipping 20 matching lines @@
             '../gpu/tools/tools.gyp:compositor_model_bench',
             '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
             '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
             '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_test',
             '../media/cast/cast.gyp:cast_benchmarks',
             '../media/cast/cast.gyp:generate_barcode_video',
             '../media/cast/cast.gyp:generate_timecode_audio',
             '../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',
             '../net/net.gyp:net_perftests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma',
             '../remoting/app_remoting_webapp.gyp:ar_sample_app',
             '../remoting/remoting.gyp:remoting_host',
             '../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
             '../remoting/remoting.gyp:remoting_key_tester',
@@ skipping 23 matching lines @@
             '../ui/compositor/compositor.gyp:compositor_unittests',
             '../ui/message_center/message_center.gyp:message_center_unittests',
             '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
             '../v8/tools/gyp/v8.gyp:v8_snapshot',
             '../v8/tools/gyp/v8.gyp:postmortem-metadata',
 
             # TODO(GYP) - list all of the examples explicitly.
             '../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',
                 '../base/base.gyp:base_unittests_run',
                 '../cc/cc_tests.gyp:cc_unittests_run',
                 '../chrome/chrome.gyp:browser_tests_run',
                 '../chrome/chrome.gyp:chrome_run',
                 '../chrome/chrome.gyp:interactive_ui_tests_run',
                 '../chrome/chrome.gyp:sync_integration_tests_run',
                 '../chrome/chrome.gyp:unit_tests_run',
@@ skipping 41 matching lines @@
         'chromium_builder_perf',
         'chromium_builder_tests',
         'chromium_builder_webrtc',
         'chromium_gpu_builder',
         'chromium_gpu_debug_builder',
       ],
     },
       ]
 }