Chromium Code Reviews| Index: chrome/chrome_tests.gypi |
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
| index 86c3616f4feef5b2fe38c392f32840410366ea9a..71bb7ae8591ac6e9d66e8675161b44e8df815ff1 100644 |
| --- a/chrome/chrome_tests.gypi |
| +++ b/chrome/chrome_tests.gypi |
| @@ -833,7 +833,7 @@ |
| '../ui/views/views.gyp:views', |
| ], |
| }], |
| - ['os_posix == 1 and OS != "mac"', { |
| + ['os_posix == 1 and OS != "mac" and OS != "android"', { |
|
John Grabowski
2012/07/13 18:19:46
/me wishes there was some way of consolidating thi
|
| 'conditions': [ |
| ['linux_use_tcmalloc==1', { |
| 'dependencies': [ |
| @@ -2266,7 +2266,7 @@ |
| '../ui/aura/aura.gyp:test_support_aura', |
| ], |
| }], |
| - ['os_posix == 1 and OS != "mac"', { |
| + ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 'conditions': [ |
| ['linux_use_tcmalloc==1', { |
| 'dependencies': [ |
| @@ -3311,7 +3311,7 @@ |
| 'common/time_format_browsertest.cc', |
| ], |
| }], |
| - ['os_posix == 1 and OS != "mac"', { |
| + ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 'conditions': [ |
| ['linux_use_tcmalloc==1', { |
| 'dependencies': [ |
| @@ -3555,7 +3555,7 @@ |
| 'chrome' |
| ], |
| }], |
| - ['os_posix == 1 and OS != "mac"', { |
| + ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 'conditions': [ |
| ['linux_use_tcmalloc==1', { |
| 'dependencies': [ |
| @@ -3762,7 +3762,7 @@ |
| '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| ], |
| }], |
| - ['os_posix == 1 and OS != "mac"', { |
| + ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 'conditions': [ |
| ['linux_use_tcmalloc==1', { |
| 'dependencies': [ |
| @@ -4280,7 +4280,7 @@ |
| '../ui/views/views.gyp:views', |
| ], |
| }], |
| - ['os_posix == 1 and OS != "mac"', { |
| + ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 'conditions': [ |
| ['linux_use_tcmalloc==1', { |
| 'dependencies': [ |