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

Unified Diff: chrome/chrome_tests.gypi

Issue 11226060: RLZ: remove hard-coded Win || Mac conditions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 2 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 | « chrome/chrome_browser.gypi ('k') | rlz/lib/rlz_lib.h » ('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 3b6a1064ac4fa74e04ea2dff0a6349c393bb1bf0..6e66284b75283ed31acebc912e986aba2ff85bd5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2522,10 +2522,14 @@
}],
['OS!="win" and OS!="mac"', {
'sources!': [
- 'browser/rlz/rlz_unittest.cc',
'../skia/ext/platform_canvas_unittest.cc',
],
}],
+ ['enable_rlz==0', {
+ 'sources!': [
+ 'browser/rlz/rlz_unittest.cc',
+ ],
+ }],
['OS=="win" and component!="shared_library"', {
# Unit_tests pdb files can get too big when incremental linking is
# on, disabling for this target.
@@ -3426,7 +3430,7 @@
'browser/ui/gtk/view_id_util_browsertest.cc',
],
}],
- ['OS!="win" and OS!="mac"', {
+ ['enable_rlz==0', {
'sources!': [
'browser/rlz/rlz_extension_apitest.cc',
],
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | rlz/lib/rlz_lib.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698