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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 409753002: Add a dependency on the AOT shim to all nacl_test_data PNaCl nexe targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | no next file » | no next file with comments »
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 a201a0511f85fcb07da09ce5900a2e64effe04bb..80020a652b7ef1440f814d301405033bb62b09e9 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -62,6 +62,12 @@
'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',
@@ -79,6 +85,9 @@
'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',
@@ -130,6 +139,9 @@
'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html',
],
},
+ 'dependencies': [
jvoung (off chromium) 2014/07/22 00:50:28 some of these should also depend on prep_toolchain
Mark Seaborn 2014/07/22 03:28:08 Is there any reason why this this dependency can't
jvoung (off chromium) 2014/07/22 15:40:54 That would be nice. I haven't tried it though. Cur
+ '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
+ ],
},
{
'target_name': 'ppapi_test_lib',
@@ -202,6 +214,7 @@
'<(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',
],
@@ -380,6 +393,7 @@
'<(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',
],
@@ -408,6 +422,7 @@
'<(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',
],
@@ -436,6 +451,7 @@
'<(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',
],
@@ -464,6 +480,7 @@
'<(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',
],
@@ -492,6 +509,7 @@
'<(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',
],
@@ -522,6 +540,7 @@
'<(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',
],
},
@@ -713,6 +732,7 @@
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_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',
],
@@ -756,6 +776,7 @@
'<(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',
@@ -1004,6 +1025,7 @@
'<(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',
],
@@ -1035,6 +1057,7 @@
'<(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',
],
@@ -1067,6 +1090,7 @@
'<(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 | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698