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

Unified Diff: chrome/chrome_tests.gypi

Issue 1240513002: Create nacl_integration.isolate. Base URL: https://chromium.googlesource.com/a/chromium/src.git@4_chrome
Patch Set: Cleaned up Created 5 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 | chrome/nacl_integration.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4dcb05627de16eabf71a956dcadd20809be23010..ef50b4977b0d39ab1606e8bfe65b68989cf6325f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3213,6 +3213,33 @@
},
],
'conditions': [
+ ['disable_nacl==1', {
+ 'targets': [
+ {
+ 'target_name': 'nacl_integration_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../third_party/mesa/mesa.gyp:osmesa',
+ 'chrome',
+ ],
+ 'conditions': [
+ ['use_x11 == 1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'nacl_integration.isolate',
+ ],
+ },
+ ],
+ }],
+ ],
+ 'conditions': [
['archive_gpu_tests==1', {
'targets': [
{
« no previous file with comments | « no previous file | chrome/nacl_integration.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698