diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:45:40 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:45:40 +0000 |
| commit | 9c7453daefe625d26df5c96f2766ca09f7040c54 (patch) | |
| tree | a30e57dfca27c4785fc611c70bee8af56829d04e /third_party/bzip2/bzip2.gyp | |
| parent | 6db833d1d8cd28e31a3cc816c397a32d795f849e (diff) | |
| download | chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.zip chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.tar.gz chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.tar.bz2 | |
Checkpoint: android fixes towards compilation of unit_tests.
Dependent on clipboard.h change in https://chromiumcodereview.appspot.com/9264014
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9226012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/bzip2/bzip2.gyp')
| -rw-r--r-- | third_party/bzip2/bzip2.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index 72730df..10f2d34 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -1,14 +1,14 @@ -# Copyright (c) 2009 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. { 'variables': { 'conditions': [ - [ 'os_posix == 1 and OS != "mac"', { + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { # Link to system .so since we already use it due to GTK. 'use_system_bzip2%': 1, - }, { # os_posix != 1 or OS == "mac" + }, { # os_posix != 1 or OS == "mac" or OS == "android" 'use_system_bzip2%': 0, }], ], |