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

4 files changed, 10 insertions, 10 deletions

diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 3da48fb..c34c2af 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -68,7 +68,7 @@
           # Don't put the 'chrome' target in 'all' on android
           'suppress_wildcard': 1,
         }],
-        ['os_posix == 1 and OS != "mac"', {
+        ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'actions': [
             {
               'action_name': 'manpage',
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': [
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 2c3323a..94e2daa 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -17,7 +17,7 @@
       # TODO(ajwong): For internal pepper plugins, which are statically linked
       # into chrome, do we want to build w/o -fPIC?  If so, how can we express
       # that in the build system?
-      ['os_posix == 1 and OS != "mac"', {
+      ['os_posix == 1 and OS != "mac" and OS != "android"', {
         'cflags': ['-fPIC', '-fvisibility=hidden'],
 
         # This is needed to make the Linux shlib build happy. Without this,
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index dd55253..d1cb6bd 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -19,7 +19,7 @@
           'HAVE_STRNLEN',
         ],
       }],
-      ['os_posix == 1 and OS != "mac"', {
+      ['os_posix == 1 and OS != "mac" and OS != "android"', {
         'cflags': [
           '-fPIC',
         ],