summaryrefslogtreecommitdiffstats
path: root/third_party/zlib
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 19:24:05 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 19:24:05 +0000
commit7ae2e5e6e6dbc3e706a0dd2efbe1d923e6406bec (patch)
tree61c40ec61ece2067586cd626baafa8a59672f5e4 /third_party/zlib
parentff0811a8763c69ee59e3e6d0421f2f43ced7d41a (diff)
downloadchromium_src-7ae2e5e6e6dbc3e706a0dd2efbe1d923e6406bec.zip
chromium_src-7ae2e5e6e6dbc3e706a0dd2efbe1d923e6406bec.tar.gz
chromium_src-7ae2e5e6e6dbc3e706a0dd2efbe1d923e6406bec.tar.bz2
Revert 266932 "GN build improvements."
> GN build improvements. > > Fixes a TODO about private symbols on GCC. > > Moves many third party BUILD.gn files from the secondary tree to the main one. > > Fixes the dependencies on Linux so "gn check" passes again. > > BUG=367595 > R=scottmg@chromium.org > > Review URL: https://codereview.chromium.org/256153003 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/257243003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r--third_party/zlib/BUILD.gn102
1 files changed, 0 insertions, 102 deletions
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
deleted file mode 100644
index 323ff86..0000000
--- a/third_party/zlib/BUILD.gn
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2013 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.
-
-config("zlib_config") {
- include_dirs = [ "." ]
-}
-
-static_library("zlib") {
- if (!is_win) {
- # Don't stomp on "libzlib" on other platforms.
- output_name = "chrome_zlib"
- }
-
- sources = [
- "adler32.c",
- "compress.c",
- "crc32.c",
- "crc32.h",
- "deflate.c",
- "deflate.h",
- "gzclose.c",
- "gzguts.h",
- "gzlib.c",
- "gzread.c",
- "gzwrite.c",
- "infback.c",
- "inffast.c",
- "inffast.h",
- "inffixed.h",
- "inflate.c",
- "inflate.h",
- "inftrees.c",
- "inftrees.h",
- "mozzconf.h",
- "trees.c",
- "trees.h",
- "uncompr.c",
- "zconf.h",
- "zlib.h",
- "zutil.c",
- "zutil.h",
- ]
-
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
-
- direct_dependent_configs = [ ":zlib_config" ]
-}
-
-static_library("minizip") {
- sources = [
- "contrib/minizip/ioapi.c",
- "contrib/minizip/ioapi.h",
- "contrib/minizip/iowin32.c",
- "contrib/minizip/iowin32.h",
- "contrib/minizip/unzip.c",
- "contrib/minizip/unzip.h",
- "contrib/minizip/zip.c",
- "contrib/minizip/zip.h",
- ]
-
- if (!is_win) {
- sources -= [
- "contrib/minizip/iowin32.c",
- "contrib/minizip/iowin32.h",
- ]
- }
- if (is_mac || is_ios || is_android) {
- # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
- # use fopen, ftell, and fseek instead on these systems.
- defines = [ "USE_FILE32API" ]
- }
-
- if (is_clang) {
- # zlib uses `if ((a == b))` for some reason.
- cflags = [ "-Wno-parentheses-equality" ]
- }
-
- deps = [ ":zlib" ]
-
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
- 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",
- ]
- }
-}