diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 00:22:04 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 00:22:55 +0000 |
| commit | b1867c911e8525d5c203299b04a7756733f6f88e (patch) | |
| tree | 7fde02cddad685bc19de3acbe8fdedede56c30ec /third_party/zlib/BUILD.gn | |
| parent | 4bf1d748acb3bae7ea8447ae80b6f24bb626eedd (diff) | |
| download | chromium_src-b1867c911e8525d5c203299b04a7756733f6f88e.zip chromium_src-b1867c911e8525d5c203299b04a7756733f6f88e.tar.gz chromium_src-b1867c911e8525d5c203299b04a7756733f6f88e.tar.bz2 | |
GN: Add mojo_shell_tests, get more things working on android
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/461903002
Cr-Commit-Position: refs/heads/master@{#289133}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/BUILD.gn')
| -rw-r--r-- | third_party/zlib/BUILD.gn | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index 323ff86..9ac85a5 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -84,19 +84,17 @@ static_library("minizip") { direct_dependent_configs = [ ":zlib_config" ] } -if (!is_android) { - static_library("zip") { - sources = [ - "google/zip.cc", - "google/zip.h", - "google/zip_internal.cc", - "google/zip_internal.h", - "google/zip_reader.cc", - "google/zip_reader.h", - ] - deps = [ - ":minizip", - "//base", - ] - } +static_library("zip") { + sources = [ + "google/zip.cc", + "google/zip.h", + "google/zip_internal.cc", + "google/zip_internal.h", + "google/zip_reader.cc", + "google/zip_reader.h", + ] + deps = [ + ":minizip", + "//base", + ] } |