From d7ec68108e5a6c4f5b7041816e8231f63e0f97f4 Mon Sep 17 00:00:00 2001
From: "yfriedman@chromium.org"
 <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 13 Jul 2012 22:07:01 +0000
Subject: Some misc gyp fix-up for Android

1) Disable fPIC
2) Disable manpage
3) Disable conditions with linux_use_tcmalloc


Review URL: https://chromiumcodereview.appspot.com/10704208

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146666 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome_tests.gypi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'chrome/chrome_tests.gypi')

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d329e61..0674251 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"', {
           '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': [
@@ -3312,7 +3312,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': [
@@ -3556,7 +3556,7 @@
             'chrome'
           ],
         }],
-        ['os_posix == 1 and OS != "mac"', {
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -3763,7 +3763,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': [
@@ -4281,7 +4281,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': [
-- 
cgit v1.1