Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3154)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/nacl/nacl_test_data.gyp

Issue 433943004: Revert "Add a dependency on the AOT shi..." and remove adhoc pexe->nexe disables. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove other pexe -> nexe disablement Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/remoting_nacl.gyp » ('j') | remoting/remoting_nacl.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/nacl/nacl_test_data.gyp
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
index 89854c0d24dbd6869776da5e5deee3d9460491c5..68aa159d5220b553b38d37216c39fb97211df653 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -62,12 +62,6 @@
'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',
@@ -85,9 +79,6 @@
'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',
@@ -139,9 +130,6 @@
'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',
@@ -214,7 +202,6 @@
'<(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',
],
@@ -393,7 +380,6 @@
'<(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',
],
@@ -422,7 +408,6 @@
'<(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',
],
@@ -451,7 +436,6 @@
'<(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',
],
@@ -480,7 +464,6 @@
'<(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',
],
@@ -509,7 +492,6 @@
'<(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',
],
@@ -540,7 +522,6 @@
'<(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',
],
},
@@ -779,7 +760,6 @@
'<(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',
@@ -832,10 +812,6 @@
'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',
@@ -857,10 +833,6 @@
'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': [
@@ -883,10 +855,6 @@
'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',
],
@@ -899,10 +867,6 @@
'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',
@@ -922,12 +886,6 @@
'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',
@@ -963,12 +921,6 @@
'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',
@@ -1028,7 +980,6 @@
'<(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',
],
@@ -1060,7 +1011,6 @@
'<(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',
],
@@ -1093,7 +1043,6 @@
'<(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',
],
« no previous file with comments | « no previous file | remoting/remoting_nacl.gyp » ('j') | remoting/remoting_nacl.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698