| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 config("zlib_config") { | 5 config("zlib_config") { | 
| 6   include_dirs = [ "." ] | 6   include_dirs = [ "." ] | 
| 7 } | 7 } | 
| 8 | 8 | 
|  | 9 static_library("zlib_x86_simd") { | 
|  | 10   if (is_linux && (cpu_arch == "x86" || cpu_arch == "x64")) { | 
|  | 11     sources = [ "crc_folding.c", | 
|  | 12                  "fill_window_sse.c" ] | 
|  | 13     cflags = ["-msse2", "-msse4.2", "-mpclmul"] | 
|  | 14   } else { | 
|  | 15     sources = [ "simd_stub.c"] | 
|  | 16   } | 
|  | 17 } | 
|  | 18 | 
| 9 static_library("zlib") { | 19 static_library("zlib") { | 
| 10   if (!is_win) { | 20   if (!is_win) { | 
| 11     # Don't stomp on "libzlib" on other platforms. | 21     # Don't stomp on "libzlib" on other platforms. | 
| 12     output_name = "chrome_zlib" | 22     output_name = "chrome_zlib" | 
| 13   } | 23   } | 
| 14 | 24 | 
| 15   sources = [ | 25   sources = [ | 
| 16     "adler32.c", | 26     "adler32.c", | 
| 17     "compress.c", | 27     "compress.c", | 
| 18     "crc32.c", | 28     "crc32.c", | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 29     "inffast.h", | 39     "inffast.h", | 
| 30     "inffixed.h", | 40     "inffixed.h", | 
| 31     "inflate.c", | 41     "inflate.c", | 
| 32     "inflate.h", | 42     "inflate.h", | 
| 33     "inftrees.c", | 43     "inftrees.c", | 
| 34     "inftrees.h", | 44     "inftrees.h", | 
| 35     "mozzconf.h", | 45     "mozzconf.h", | 
| 36     "trees.c", | 46     "trees.c", | 
| 37     "trees.h", | 47     "trees.h", | 
| 38     "uncompr.c", | 48     "uncompr.c", | 
|  | 49     "x86.c", | 
|  | 50     "x86.h", | 
| 39     "zconf.h", | 51     "zconf.h", | 
| 40     "zlib.h", | 52     "zlib.h", | 
| 41     "zutil.c", | 53     "zutil.c", | 
| 42     "zutil.h", | 54     "zutil.h", | 
| 43   ] | 55   ] | 
| 44 | 56 | 
|  | 57   if (is_linux && (cpu_arch == "x86" || cpu_arch == "x64")) { | 
|  | 58     defines = [ "HAVE_ARCH_INTEL" ] | 
|  | 59   } | 
|  | 60 | 
| 45   configs -= [ "//build/config/compiler:chromium_code" ] | 61   configs -= [ "//build/config/compiler:chromium_code" ] | 
| 46   configs += [ "//build/config/compiler:no_chromium_code" ] | 62   configs += [ "//build/config/compiler:no_chromium_code" ] | 
| 47 | 63 | 
| 48   direct_dependent_configs = [ ":zlib_config" ] | 64   direct_dependent_configs = [ ":zlib_config" ] | 
| 49 } | 65 } | 
| 50 | 66 | 
| 51 static_library("minizip") { | 67 static_library("minizip") { | 
| 52   sources = [ | 68   sources = [ | 
| 53     "contrib/minizip/ioapi.c", | 69     "contrib/minizip/ioapi.c", | 
| 54     "contrib/minizip/ioapi.h", | 70     "contrib/minizip/ioapi.h", | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 91     "google/zip_internal.cc", | 107     "google/zip_internal.cc", | 
| 92     "google/zip_internal.h", | 108     "google/zip_internal.h", | 
| 93     "google/zip_reader.cc", | 109     "google/zip_reader.cc", | 
| 94     "google/zip_reader.h", | 110     "google/zip_reader.h", | 
| 95   ] | 111   ] | 
| 96   deps = [ | 112   deps = [ | 
| 97     ":minizip", | 113     ":minizip", | 
| 98     "//base", | 114     "//base", | 
| 99   ] | 115   ] | 
| 100 } | 116 } | 
| OLD | NEW | 
|---|