diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 22:07:01 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 22:07:01 +0000 |
| commit | d7ec68108e5a6c4f5b7041816e8231f63e0f97f4 (patch) | |
| tree | be29f71e9fd987912501996d944a0fba4c54a29c /ppapi/ppapi.gyp | |
| parent | f3c554d020c053b988bd87030c7500fbb23e3605 (diff) | |
| download | chromium_src-d7ec68108e5a6c4f5b7041816e8231f63e0f97f4.zip chromium_src-d7ec68108e5a6c4f5b7041816e8231f63e0f97f4.tar.gz chromium_src-d7ec68108e5a6c4f5b7041816e8231f63e0f97f4.tar.bz2 | |
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
Diffstat (limited to 'ppapi/ppapi.gyp')
| -rw-r--r-- | ppapi/ppapi.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
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, |