Revert "Add a dependency on the AOT shi..." and remove adhoc pexe->nexe disables.

chrome/test/data/nacl/nacl_test_data.gyp

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     '../../../../ppapi/ppapi_nacl_test_common.gypi',
   ],
   'targets': [
     {
@@ skipping 44 matching lines @@
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'sources': [
           'simple.cc',
         ],
         'test_files': [
           'nacl_load_test.html',
         ],
       },
-      # We only need the pexe for this test. However, build_pnacl_newlib: 1
-      # will also translate that pexe into a nexe, so add the shim
-      # just in case of a race condition.
-      'dependencies': [
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
-      ],
     },
     {
       'target_name': 'exit_status_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pm_exit_status_test',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'sources': [
           'exit_status/pm_exit_status_test.cc',
         ],
         'test_files': [
           'exit_status/pm_exit_status_test.html',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
-      ],
     },
     {
       'target_name': 'extension_validation_cache',
       'type': 'none',
       'variables': {
         'nexe_target': 'extension_validation_cache',
         # The test currently only has the test expectations for the
         # newlib case (# validation queries/settings), and has also
         # hardcoded the newlib variant's directory path for the unpacked ext.
         'build_newlib': 1,
@@ skipping 31 matching lines @@
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'sources': [
           'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.cc',
         ],
         'test_files': [
           'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html',
         ],
       },
-      'dependencies': [
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
-      ],
     },
     {
       'target_name': 'ppapi_test_lib',
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_test_lib.a',
         'nso_target': 'libppapi_test_lib.so',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
@@ skipping 52 matching lines @@
         ],
         'test_files': [
           'progress_events/ppapi_progress_events.html',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_bad_ppp_initialize',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_bad_ppp_initialize',
         'build_newlib': 1,
@@ skipping 158 matching lines @@
         ],
         'sources': [
           'crash/ppapi_crash_via_check_failure.cc',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_via_exit_call',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_via_exit_call',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_via_exit_call.cc',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_in_callback',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_in_callback',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_in_callback.cc',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_off_main_thread',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_off_main_thread',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_off_main_thread.cc',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_crash_ppapi_off_main_thread',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_crash_ppapi_off_main_thread',
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
         ],
         'sources': [
           'crash/ppapi_crash_ppapi_off_main_thread.cc',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'pm_redir_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pm_redir_test',
         'build_newlib': 1,
@@ skipping 10 matching lines @@
         ],
         'test_files': [
           'postmessage_redir/pm_redir_test.html',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
       ],
     },
     {
       'target_name': 'pm_manifest_file',
       'type': 'none',
       'variables': {
         'nexe_target': 'pm_manifest_file',
         'build_newlib': 1,
         'build_glibc': 1,
@@ skipping 218 matching lines @@
           'nameservice/pm_nameservice_test.cc',
         ],
         'test_files': [
           'nameservice/pm_nameservice_test.html',
         ],
       },
       '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',
         '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
         '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
         '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
         'nacl_ppapi_util',
       ],
     },
     {
@@ skipping 32 matching lines @@
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'pnacl_debug_url_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pnacl_debug_url',
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
-        # No need to translate these AOT, when we just need the pexe.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
         'generate_nmf': 0,
         'sources': [
           'simple.cc',
         ],
         'test_files': [
           'pnacl_debug_url/pnacl_debug_url.html',
           'pnacl_debug_url/pnacl_has_debug.nmf',
           'pnacl_debug_url/pnacl_has_debug_flag_off.nmf',
           'pnacl_debug_url/pnacl_no_debug.nmf',
         ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ]
     },
     {
       'target_name': 'pnacl_error_handling_test',
       'type': 'none',
       'variables': {
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
-        # No need to translate AOT.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
         # Use prebuilt NMF files.
         'generate_nmf': 0,
         'test_files': [
           'pnacl_error_handling/pnacl_error_handling.html',
           'pnacl_error_handling/bad.pexe',
           'pnacl_error_handling/pnacl_bad_pexe.nmf',
           'pnacl_error_handling/pnacl_bad_doesnotexist.nmf',
           'pnacl_error_handling/pnacl_illformed_manifest.nmf',
         ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ]
     },
     {
       'target_name': 'pnacl_mime_type_test',
       'type': 'none',
       'variables': {
         'build_newlib': 1,
         'build_glibc': 1,
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
-        # No need to translate AOT.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
         'test_files': [
           'pnacl_mime_type/pnacl_mime_type.html',
         ],
       },
     },
     {
       'target_name': 'pnacl_options_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pnacl_options',
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
-        # No need to translate these AOT, when we just need the pexe.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
         'generate_nmf': 0,
         'sources': [
           'simple.cc',
         ],
         'test_files': [
           'pnacl_nmf_options/pnacl_options.html',
           'pnacl_nmf_options/pnacl_o_0.nmf',
           'pnacl_nmf_options/pnacl_o_2.nmf',
           'pnacl_nmf_options/pnacl_o_large.nmf',
         ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ]
     },
     {
       'target_name': 'pnacl_dyncode_syscall_disabled_test',
       'type': 'none',
       'variables': {
-        # This tests that nexes produced by translation in the browser are not
-        # able to use the dyncode syscalls.  Pre-translated nexes are not
-        # subject to this constraint, so we do not test them.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
         'nexe_target': 'pnacl_dyncode_syscall_disabled',
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
           # The "_private" variant of the library calls the syscalls
           # directly, which allows us to test the syscalls directly,
@@ skipping 15 matching lines @@
         '<(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',
       ],
     },
     {
       'target_name': 'pnacl_hw_eh_disabled_test',
       'type': 'none',
       'variables': {
-        # This tests that nexes produced by translation in the browser are not
-        # able to use hardware exception handling.  Pre-translated nexes are
-        # not subject to this constraint, so we do not test them.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
         'nexe_target': 'pnacl_hw_eh_disabled',
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         'link_flags': [
           '-lppapi',
           '-lppapi_test_lib',
           '-lplatform',
           '-lgio',
           # The "_private" variant of the library calls the syscalls
           # directly, which allows us to test the syscalls directly,
@@ skipping 39 matching lines @@
         ],
         'test_files': [
           'ppapi/ppb_core/ppapi_ppb_core.html',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_ppb_instance',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_ppb_instance',
         'build_newlib': 1,
@@ skipping 11 matching lines @@
         ],
         'test_files': [
           'ppapi/ppb_instance/ppapi_ppb_instance.html',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
     {
       'target_name': 'ppapi_ppp_instance',
       'type': 'none',
       'variables': {
         'nexe_target': 'ppapi_ppp_instance',
         'build_newlib': 1,
@@ skipping 12 matching lines @@
         'test_files': [
           'ppapi/ppp_instance/ppapi_ppp_instance.html',
           'ppapi/ppp_instance/ppapi_ppp_instance.js',
         ],
       },
       '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',
-        '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
         '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
   ],
   'conditions': [
     ['target_arch!="arm"', {
       # Source file does not have asm for ARM.
       'targets': [
         {
@@ skipping 147 matching lines @@
               'files': [
                 '>@(test_files)',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }