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

Unified Diff: chrome/chrome_tests.gypi

Issue 10704208: Some misc gyp fix-up for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 | « chrome/chrome_exe.gypi ('k') | ppapi/ppapi.gyp » ('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 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': [
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | ppapi/ppapi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698