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

Unified Diff: build/all.gyp

Issue 401453002: Create NaCl build of gtest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GYP fix Created 6 years, 4 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 | testing/gtest.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 2e3f672e6f5774fe894f6b2a1edba3be6326dafd..e4448b4a7f4ebb5bb8c9a4e185afc08c16962cea 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -409,6 +409,11 @@
'../components/nacl.gyp:nacl_loader_unittests',
],
}],
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '../testing/gtest_nacl.gyp:*',
+ ],
+ }],
],
}, # target_name: chromium_builder_tests
],
« no previous file with comments | « no previous file | testing/gtest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698