summaryrefslogtreecommitdiffstats
path: root/testing/chromoting
diff options
context:
space:
mode:
authoranandc <anandc@chromium.org>2015-03-25 13:12:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-25 20:13:59 +0000
commited9b8624c70da7ee429fc2beee125a4ec0fc36d0 (patch)
treee3873651b6fedf3389866f32815934cdf72fd2c5 /testing/chromoting
parent8944e6f2b74d80aba842b29e41de404f1ad2efab (diff)
downloadchromium_src-ed9b8624c70da7ee429fc2beee125a4ec0fc36d0.zip
chromium_src-ed9b8624c70da7ee429fc2beee125a4ec0fc36d0.tar.gz
chromium_src-ed9b8624c70da7ee429fc2beee125a4ec0fc36d0.tar.bz2
Add pnacl dependencies to get browser-tests passing again.
BUG=470158 Review URL: https://codereview.chromium.org/1031213002 Cr-Commit-Position: refs/heads/master@{#322227}
Diffstat (limited to 'testing/chromoting')
-rw-r--r--testing/chromoting/chromoting_integration_tests.isolate13
1 files changed, 13 insertions, 0 deletions
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate
index 8dcbe5d..203815e 100644
--- a/testing/chromoting/chromoting_integration_tests.isolate
+++ b/testing/chromoting/chromoting_integration_tests.isolate
@@ -31,6 +31,19 @@
'<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
'<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
'<(PRODUCT_DIR)/remoting-me2me-host.deb',
+ '<(PRODUCT_DIR)/nacl_helper',
+ '<(PRODUCT_DIR)/nacl_helper_bootstrap',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_pnacl_json',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_crtbegin_for_eh_o',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_crtbegin_o',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_crtend_o',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_ld_nexe',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_libcrt_platform_a',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_libgcc_a',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_libpnacl_irt_shim_a',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_libpnacl_irt_shim_dummy_a',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_pnacl_llc_nexe',
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_pnacl_sz_nexe',
],
},
}],