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-Original-Commit-Position: refs/heads/master@{#318626}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 425ba073036f96f04aea09c9836826ccb2e124e4

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',
       ],

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',