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 /chrome/chrome_tests.gypi | |
| 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 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
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': [ |