NaCl/GYP: remove references to prep_toolchain.

prep_toolchain is now a no-op.

BUG=456902

Review URL: https://codereview.chromium.org/1097153002

Cr-Commit-Position: refs/heads/master@{#326044}

34 files changed, 0 insertions, 119 deletions

diff --git a/base/base_nacl.gyp b/base/base_nacl.gyp
index 90a2893..40005d2 100644
--- a/base/base_nacl.gyp
+++ b/base/base_nacl.gyp
@@ -39,9 +39,6 @@
               '-fno-strict-aliasing',
             ],
           },
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-          ],
         },
         {
           'target_name': 'base_i18n_nacl',
@@ -63,7 +60,6 @@
             ],
           },
           'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
             '../third_party/icu/icu_nacl.gyp:icudata_nacl',
             '../third_party/icu/icu_nacl.gyp:icui18n_nacl',
             '../third_party/icu/icu_nacl.gyp:icuuc_nacl',
@@ -113,7 +109,6 @@
             'rand_util_nacl.cc',
           ],
           'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
             '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi',
           ],
         },
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
index 0372000..78d3aa6 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -126,9 +126,6 @@
 	  'simple_cc.js',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
     {
       'target_name': 'sysconf_nprocessors_onln_test',
@@ -166,9 +163,6 @@
           '../../../../ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc',
         ]
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
     {
       'target_name': 'ppapi_progress_events',
@@ -193,7 +187,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -220,7 +213,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -245,7 +237,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -270,7 +261,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -295,7 +285,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -320,7 +309,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -345,7 +333,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -371,7 +358,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -399,7 +385,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -427,7 +412,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -455,7 +439,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -483,7 +466,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -525,7 +507,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
         '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
@@ -586,7 +567,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_lib',
@@ -641,7 +621,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
@@ -666,9 +645,6 @@
           'pnacl_debug_url/pnacl_no_debug.nmf',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ]
     },
     {
       'target_name': 'pnacl_error_handling_test',
@@ -686,9 +662,6 @@
           'pnacl_error_handling/pnacl_illformed_manifest.nmf',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ]
     },
     {
       'target_name': 'pnacl_mime_type_test',
@@ -721,9 +694,6 @@
           'pnacl_nmf_options/pnacl_o_large.nmf',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ]
     },
     {
       'target_name': 'pnacl_dyncode_syscall_disabled_test',
@@ -754,7 +724,6 @@
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_dyncode_private_lib',
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
@@ -789,7 +758,6 @@
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_private_lib',
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
@@ -819,7 +787,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -850,7 +817,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -882,7 +848,6 @@
         ],
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -920,9 +885,6 @@
               }],
             ],
           },
-          'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-          ],
         },
       ],
     }],
diff --git a/components/nacl_nonsfi.gyp b/components/nacl_nonsfi.gyp
index 867bce0..3df9c45 100644
--- a/components/nacl_nonsfi.gyp
+++ b/components/nacl_nonsfi.gyp
@@ -140,7 +140,6 @@
             '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
             '../native_client/src/nonsfi/loader/loader.gyp:elf_loader',
             '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
-            '../native_client/tools.gyp:prep_toolchain',
             '../ppapi/ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
             '../sandbox/sandbox_nacl_nonsfi.gyp:sandbox_nacl_nonsfi',
           ],
diff --git a/components/tracing_nacl.gyp b/components/tracing_nacl.gyp
index d0fc45d..022a6c6 100644
--- a/components/tracing_nacl.gyp
+++ b/components/tracing_nacl.gyp
@@ -19,7 +19,6 @@
             '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../ipc/ipc_nacl.gyp:ipc_nacl',
             '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
           ],
           'include_dirs': [
             '..',
diff --git a/content/content_nacl_nonsfi.gyp b/content/content_nacl_nonsfi.gyp
index 4f30ca4..f60f120 100644
--- a/content/content_nacl_nonsfi.gyp
+++ b/content/content_nacl_nonsfi.gyp
@@ -32,7 +32,6 @@
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
       ],
diff --git a/crypto/crypto_nacl.gyp b/crypto/crypto_nacl.gyp
index 4451610..255c42c 100644
--- a/crypto/crypto_nacl.gyp
+++ b/crypto/crypto_nacl.gyp
@@ -23,7 +23,6 @@
       },
       'dependencies': [
         '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
-        '../native_client/tools.gyp:prep_toolchain',
         '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
       ],
       'defines': [
diff --git a/gpu/command_buffer/command_buffer_nacl.gyp b/gpu/command_buffer/command_buffer_nacl.gyp
index 319fc67..e058999 100644
--- a/gpu/command_buffer/command_buffer_nacl.gyp
+++ b/gpu/command_buffer/command_buffer_nacl.gyp
@@ -27,7 +27,6 @@
             'build_nonsfi_helper': 1,
           },
           'dependencies': [
-            '../../native_client/tools.gyp:prep_toolchain',
             '../../base/base_nacl.gyp:base_nacl',
             '../../base/base_nacl.gyp:base_nacl_nonsfi',
             '../../third_party/khronos/khronos.gyp:khronos_headers',
diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp
index 003f0af..1f38619 100644
--- a/gpu/gpu_nacl.gyp
+++ b/gpu/gpu_nacl.gyp
@@ -36,7 +36,6 @@
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
             '../third_party/khronos/khronos.gyp:khronos_headers',
             'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
             'gles2_cmd_helper_nacl',
@@ -60,7 +59,6 @@
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
             'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
           ],
         },
@@ -82,7 +80,6 @@
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
             'command_buffer_client_nacl',
           ],
         },
@@ -104,7 +101,6 @@
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
             'command_buffer_common_nacl',
           ],
         },
@@ -126,7 +122,6 @@
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
             'command_buffer_common_nacl',
           ],
         },
diff --git a/ipc/ipc_nacl.gyp b/ipc/ipc_nacl.gyp
index 6f0d522..5faf9af 100644
--- a/ipc/ipc_nacl.gyp
+++ b/ipc/ipc_nacl.gyp
@@ -26,7 +26,6 @@
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
-            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
         {
@@ -56,7 +55,6 @@
           ],
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
       ],
diff --git a/jingle/jingle_nacl.gyp b/jingle/jingle_nacl.gyp
index d622fbe..b20f641 100644
--- a/jingle/jingle_nacl.gyp
+++ b/jingle/jingle_nacl.gyp
@@ -31,7 +31,6 @@
       ],
       'dependencies': [
         '../base/base_nacl.gyp:base_nacl',
-        '../native_client/tools.gyp:prep_toolchain',
         '../net/net_nacl.gyp:net_nacl',
         '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
       ],
diff --git a/media/media_nacl.gyp b/media/media_nacl.gyp
index 39c832e..9697a8a 100644
--- a/media/media_nacl.gyp
+++ b/media/media_nacl.gyp
@@ -27,7 +27,6 @@
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
           ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
@@ -51,9 +50,6 @@
             'build_newlib': 0,
             'build_pnacl_newlib': 1,
           },
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-          ],
           'sources': [
             'base/media.cc',
             'base/media.h',
diff --git a/mojo/mojo_nacl_untrusted.gyp b/mojo/mojo_nacl_untrusted.gyp
index eeca342..4054b32 100644
--- a/mojo/mojo_nacl_untrusted.gyp
+++ b/mojo/mojo_nacl_untrusted.gyp
@@ -24,7 +24,6 @@
             '<(monacl_codegen_dir)/libmojo.cc',
           ],
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
             'mojo_nacl.gyp:monacl_codegen',
             '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
           ],
@@ -44,7 +43,6 @@
             '<(monacl_codegen_dir)/mojo_irt.h',
           ],
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
             'mojo_nacl.gyp:monacl_codegen',
           ],
           'direct_dependent_settings': {
@@ -71,7 +69,6 @@
             ],
           },
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
             '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
             '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
             '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
diff --git a/native_client_sdk/native_client_sdk_untrusted.gyp b/native_client_sdk/native_client_sdk_untrusted.gyp
index 140664f..2cd3dc5 100644
--- a/native_client_sdk/native_client_sdk_untrusted.gyp
+++ b/native_client_sdk/native_client_sdk_untrusted.gyp
@@ -35,7 +35,6 @@
             '>!@pymod_do_main(dsc_info -s -l src/libraries/nacl_io nacl_io)',
           ],
           'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
             '../ppapi/native_client/native_client.gyp:ppapi_lib',
           ],
         },
diff --git a/net/net_nacl.gyp b/net/net_nacl.gyp
index 2753c21..14c345c 100644
--- a/net/net_nacl.gyp
+++ b/net/net_nacl.gyp
@@ -23,7 +23,6 @@
       },
       'dependencies': [
         '../crypto/crypto_nacl.gyp:crypto_nacl',
-        '../native_client/tools.gyp:prep_toolchain',
         '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
diff --git a/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp b/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp
index db1493d..c00cf98 100644
--- a/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp
+++ b/ppapi/native_client/src/untrusted/irt_stub/irt_stub.gyp
@@ -25,9 +25,6 @@
         'ppapi_plugin_start.c',
         'thread_creator.c'
       ],
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
   ],
 }
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
index a2e9e1f..946437d 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
@@ -51,9 +51,6 @@
           '-DPNACL_SHIM_AOT',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
     # Smaller shim library for PNaCl in-browser translation.
     # Uses an unstable IRT hook interface to get the shim from the IRT itself.
@@ -87,9 +84,6 @@
           '--strip-debug',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
     {
       # Second half of shim library for PNaCl in-browser translation.
@@ -109,9 +103,6 @@
           'pnacl_shim.c',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
   ],
 }
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
index e8dc67d..573151d 100644
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
@@ -20,7 +20,6 @@
       ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
         'dependencies': [
           '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:browser',
-          '../../../../../native_client/tools.gyp:prep_toolchain',
         ],
         'sources': [
           'pnacl_component_crx_gen.py',
diff --git a/ppapi/ppapi_ipc_nacl.gyp b/ppapi/ppapi_ipc_nacl.gyp
index c82a4ec..3608f80 100644
--- a/ppapi/ppapi_ipc_nacl.gyp
+++ b/ppapi/ppapi_ipc_nacl.gyp
@@ -31,7 +31,6 @@
             '..',
           ],
           'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index 91a4a40..aa7b718 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -27,9 +27,6 @@
           'cpp/ppp_entrypoints.cc',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
     {
       'target_name': 'ppapi_gles2_lib',
@@ -49,15 +46,11 @@
           'lib/gl/gles2/gles2.c',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
     },
     {
       'target_name': 'ppapi_nacl_tests',
       'type': 'none',
       'dependencies': [
-         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
          '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
          '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
          'ppapi_cpp_lib',
diff --git a/ppapi/ppapi_proxy_nacl.gyp b/ppapi/ppapi_proxy_nacl.gyp
index c71f9e5..7740a4e 100644
--- a/ppapi/ppapi_proxy_nacl.gyp
+++ b/ppapi/ppapi_proxy_nacl.gyp
@@ -42,7 +42,6 @@
             '../ipc/ipc_nacl.gyp:ipc_nacl',
             '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
             '../mojo/mojo_nacl.gyp:monacl_codegen',
-            '../native_client/tools.gyp:prep_toolchain',
             '../ppapi/ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
             '../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
             '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
diff --git a/ppapi/ppapi_shared_nacl.gyp b/ppapi/ppapi_shared_nacl.gyp
index 819acc7..05e4aca 100644
--- a/ppapi/ppapi_shared_nacl.gyp
+++ b/ppapi/ppapi_shared_nacl.gyp
@@ -31,7 +31,6 @@
             '..',
           ],
           'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
             '../base/base_nacl.gyp:base_nacl',
             '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
diff --git a/remoting/remoting_key_tester.gypi b/remoting/remoting_key_tester.gypi
index 7eac507..ba16e41 100644
--- a/remoting/remoting_key_tester.gypi
+++ b/remoting/remoting_key_tester.gypi
@@ -96,10 +96,6 @@
             '-lppapi_stub',
             '-lppapi_cpp',
           ],
-          'dependencies': [
-            # TODO(mseaborn): Remove need for this (https://crbug.com/456902).
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-          ],
         },  # end of target 'remoting_key_tester_pexe'
       ],
     }]
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index b7c7374..b66a742 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -74,7 +74,6 @@
         'GOOGLE_PROTOBUF_HOST_ARCH_64_BIT=1'
       ],
       'dependencies': [
-        '../native_client/tools.gyp:prep_toolchain',
         '../third_party/protobuf/protobuf_nacl.gyp:protobuf_lite_nacl',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
       ],
@@ -101,7 +100,6 @@
       'dependencies': [
         '../base/base_nacl.gyp:base_nacl',
         '../jingle/jingle_nacl.gyp:jingle_glue_nacl',
-        '../native_client/tools.gyp:prep_toolchain',
         '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '../net/net_nacl.gyp:net_nacl',
         '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
@@ -181,7 +179,6 @@
         '../crypto/crypto_nacl.gyp:crypto_nacl',
         '../jingle/jingle_nacl.gyp:jingle_glue_nacl',
         '../media/media_nacl.gyp:media_yuv_nacl',
-        '../native_client/tools.gyp:prep_toolchain',
         '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '../net/net_nacl.gyp:net_nacl',
         '../ppapi/native_client/native_client.gyp:ppapi_lib',
diff --git a/sandbox/sandbox_nacl_nonsfi.gyp b/sandbox/sandbox_nacl_nonsfi.gyp
index c757ec5..781df42 100644
--- a/sandbox/sandbox_nacl_nonsfi.gyp
+++ b/sandbox/sandbox_nacl_nonsfi.gyp
@@ -39,7 +39,6 @@
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
       ],
diff --git a/third_party/boringssl/boringssl_nacl.gyp b/third_party/boringssl/boringssl_nacl.gyp
index 6ab4b9d..cfd43b9 100644
--- a/third_party/boringssl/boringssl_nacl.gyp
+++ b/third_party/boringssl/boringssl_nacl.gyp
@@ -16,7 +16,6 @@
         'build_pnacl_newlib': 1,
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
       ],
       'includes': [
diff --git a/third_party/jsoncpp/jsoncpp_nacl.gyp b/third_party/jsoncpp/jsoncpp_nacl.gyp
index d60510c..565cb38 100644
--- a/third_party/jsoncpp/jsoncpp_nacl.gyp
+++ b/third_party/jsoncpp/jsoncpp_nacl.gyp
@@ -24,9 +24,6 @@
             # overrides/src/lib_json/json_value.cpp:38.
             '-fno-strict-aliasing',
           ],
-          'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-          ],
         },
       ],
     }],
diff --git a/third_party/libevent/libevent_nacl_nonsfi.gyp b/third_party/libevent/libevent_nacl_nonsfi.gyp
index 704de10..37a78ad6 100644
--- a/third_party/libevent/libevent_nacl_nonsfi.gyp
+++ b/third_party/libevent/libevent_nacl_nonsfi.gyp
@@ -40,9 +40,6 @@
             'build_pnacl_newlib': 0,
             'build_nonsfi_helper': 1,
           },
-          'dependencies': [
-            '../../native_client/tools.gyp:prep_toolchain',
-          ],
         },
       ],
     }],
diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp
index 6848b29..1fd66e7 100644
--- a/third_party/libjingle/libjingle_nacl.gyp
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -25,7 +25,6 @@
         'use_openssl': 1,
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '<(DEPTH)/third_party/expat/expat_nacl.gyp:expat_nacl',
         '<(DEPTH)/third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
diff --git a/third_party/liblouis/liblouis_nacl.gyp b/third_party/liblouis/liblouis_nacl.gyp
index 081658f..478252a 100644
--- a/third_party/liblouis/liblouis_nacl.gyp
+++ b/third_party/liblouis/liblouis_nacl.gyp
@@ -65,9 +65,6 @@
             'src/liblouis/transcommon.ci',
             'src/liblouis/wrappers.c',
           ],
-          'dependencies': [
-            '../../native_client/tools.gyp:prep_toolchain',
-          ],
         },
         {
           'target_name': 'liblouis_nacl_wrapper_nacl',
@@ -119,7 +116,6 @@
           ],
           'dependencies': [
             '../../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
-            '../../native_client/tools.gyp:prep_toolchain',
             '../../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
             '../../ppapi/native_client/native_client.gyp:ppapi_lib',
             '../../ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
diff --git a/third_party/modp_b64/modp_b64_nacl.gyp b/third_party/modp_b64/modp_b64_nacl.gyp
index cd0d210..e2f4a25 100644
--- a/third_party/modp_b64/modp_b64_nacl.gyp
+++ b/third_party/modp_b64/modp_b64_nacl.gyp
@@ -16,9 +16,6 @@
         'build_newlib': 1,
         'build_pnacl_newlib': 1,
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
       'sources': [
         'modp_b64.cc',
         'modp_b64.h',
diff --git a/third_party/opus/opus_nacl.gyp b/third_party/opus/opus_nacl.gyp
index c4287c27..27dc55c 100644
--- a/third_party/opus/opus_nacl.gyp
+++ b/third_party/opus/opus_nacl.gyp
@@ -16,9 +16,6 @@
         'build_newlib': 0,
         'build_pnacl_newlib': 1,
       },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-      ],
       'defines': [
         'OPUS_BUILD',
         'OPUS_EXPORT=',
diff --git a/third_party/protobuf/protobuf_nacl.gyp b/third_party/protobuf/protobuf_nacl.gyp
index e8741c2..ae37f2f 100644
--- a/third_party/protobuf/protobuf_nacl.gyp
+++ b/third_party/protobuf/protobuf_nacl.gyp
@@ -17,9 +17,6 @@
         'build_pnacl_newlib': 1,
         'config_h_dir': '.',
       },
-      'dependencies': [
-        '../../native_client/tools.gyp:prep_toolchain',
-      ],
       'pnacl_compile_flags': [
         # This disables #warning in hash_map/hash_set headers which are
         # deprecated but still used in protobuf.
diff --git a/third_party/usrsctp/usrsctp_nacl.gyp b/third_party/usrsctp/usrsctp_nacl.gyp
index bf5c84f..7cce5e7 100644
--- a/third_party/usrsctp/usrsctp_nacl.gyp
+++ b/third_party/usrsctp/usrsctp_nacl.gyp
@@ -16,7 +16,6 @@
         'build_pnacl_newlib': 1,
       },
       'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '<(DEPTH)/third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
       ],
diff --git a/ui/events/latency_info_nacl.gyp b/ui/events/latency_info_nacl.gyp
index c44e499..1b7e402 100644
--- a/ui/events/latency_info_nacl.gyp
+++ b/ui/events/latency_info_nacl.gyp
@@ -23,7 +23,6 @@
             '../../base/base_nacl.gyp:base_nacl_nonsfi',
             '../../ipc/ipc_nacl.gyp:ipc_nacl',
             '../../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
-            '../../native_client/tools.gyp:prep_toolchain'
           ],
           'variables': {
             'nacl_untrusted_build': 1,