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}
cbchan · Apr 21, 2015 · e9705fd · e9705fd
1 parent 968594e
commit e9705fd
Show file tree

Hide file tree

Showing 34 changed files with 0 additions and 119 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',
           ],
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ @@
               },
               'dependencies': [
                 '../base/base_nacl.gyp:base_nacl_nonsfi',
-                '../native_client/tools.gyp:prep_toolchain',
               ],
             },
           ],
@@ Expand Down @@