Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: third_party/zlib/zlib.gyp

Issue 2332843004: Remove GYP files. (Closed)
Patch Set: Merge Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/zlib/google/zip.gyp ('k') | url/ipc/url_ipc.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.gyp
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
deleted file mode 100644
index 42e4e9508499fc2f6da0083882edbd508265edcf..0000000000000000000000000000000000000000
--- a/third_party/zlib/zlib.gyp
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.
-
-{
- 'targets': [
- {
- 'target_name' : 'zlib_x86_simd',
- 'type': 'static_library',
- 'conditions': [
- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
- 'cflags' : ['-msse4.2', '-mpclmul'],
- 'xcode_settings' : {
- 'OTHER_CFLAGS' : ['-msse4.2', '-mpclmul'],
- },
- 'sources' : [
- 'crc_folding.c',
- 'fill_window_sse.c',
- ],
- 'conditions': [
- ['OS=="win" and clang==1', {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'AdditionalOptions': [ '-msse4.2', '-mpclmul' ],
- },
- },
- }],
- ],
- }, {
- 'sources' : [ 'simd_stub.c' ],
- }],
- ['OS=="android"', {
- 'toolsets': ['target', 'host'],
- }],
- ],
- },
- {
- 'target_name': 'zlib',
- 'type': 'static_library',
- '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',
- 'x86.h',
- 'zconf.h',
- 'zlib.h',
- 'zutil.c',
- 'zutil.h',
- ],
- 'dependencies' : [
- 'zlib_x86_simd'
- ],
- 'include_dirs': [
- '.',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '.',
- ],
- },
- 'conditions': [
- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
- 'sources' : [ 'x86.c', ],
- 'variables': {
- 'clang_warning_flags': [
- '-Wno-incompatible-pointer-types',
- ],
- },
- }],
- ['OS!="win"', {
- 'product_name': 'chrome_zlib',
- }], ['OS=="android"', {
- 'toolsets': ['target', 'host'],
- }],
- ],
- },
- {
- 'target_name': 'minizip',
- 'type': 'static_library',
- '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',
- ],
- 'dependencies': [
- 'zlib',
- ],
- 'include_dirs': [
- '.',
- '../..',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '.',
- ],
- },
- 'variables': {
- 'clang_warning_flags': [
- # zlib uses `if ((a == b))` for some reason.
- '-Wno-parentheses-equality',
- ],
- },
- 'conditions': [
- ['OS!="win"', {
- 'sources!': [
- 'contrib/minizip/iowin32.c'
- ],
- }],
- ['OS=="android"', {
- 'toolsets': ['target', 'host'],
- }],
- ['OS=="mac" or OS=="ios" or os_bsd==1 or OS=="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'
- ],
- }],
- ],
- },
- ],
-}
« no previous file with comments | « third_party/zlib/google/zip.gyp ('k') | url/ipc/url_ipc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698